On Thu, Nov 29, 2012 at 04:29:45PM +1100, Stephen Rothwell wrote:

Hi Thierry,

Today's linux-next merge of the pwm tree got a conflict in
drivers/pwm/pwm-twl6030.c between commit fd1091125a1d ("pwm: remove use
of __devexit_p") from the driver-core tree and commit 6179a58ec7e2 ("pwm:
Remove pwm-twl6030 driver") from the pwm tree.

I fixed it up (the latter removed the file) and can carry the fix as
necessary (no action is required).

Great, thanks!

Thierry