Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/twl-core.c between commit 78a3c5ab1749 ("mfd: twl-core: Fix
chip ID for the twl6030-pwm module") from Linus' tree and commit
afc45898f62c ("mfd: twl-core: Support for proper PWM drivers") from the
mfd tree.

I fixed it up (using the version from the mfd tree) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au