linux-next: manual merge of the pm tree with the mfd tree
From: Stephen Rothwell
Date: Mon Aug 22 2011 - 23:56:37 EST
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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp00000.pgp
Description: PGP signature