Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
drivers/rtc/rtc-twl.c between commits dec35d19c4ec ("rtc: rtc-twl: Switch
to using threaded irq") and 34d623d11316 ("rtc: rtc-twl: Remove lockdep
related local_irq_enable()") from Linus' tree and commit 02e964b17e2f
("rtc: Move twl to threaded irq") from the mfd tree.
The 2 commits from Linus' tree do exactly what the single mfd tree commit
does. I used the version from Linus' tree (which had further changes).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpe1E0y0G0yp.pgp
Description: PGP signature
