Messages in this thread |  | | | Date | Tue, 23 Aug 2011 13:56:19 +1000 | | From | Stephen Rothwell <> | | Subject | linux-next: manual merge of the pm tree with the mfd tree |
| |
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in drivers/mfd/twl4030-irq.c between commit 99efe0d4c992 ("mfd: Drop the twl4030-irq kthread") from the mfd tree and commit febab68efa45 ("freezer: don't unnecessarily set PF_NOFREEZE explicitly") from the pm tree.
The former dropped the code modified by the latter, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] |  |