[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Wed, 2 Nov 2011 12:22:21 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Ben Dooks <ben-linux@...ff.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Yong Zhang <yong.zhang0@...il.com>
Subject: linux-next: manual merge of the bjdooks-i2c tree with Linus' tree
Hi Ben,
Today's linux-next merge of the bjdooks-i2c tree got a conflict in
drivers/i2c/busses/i2c-designware-platdrv.c between commit 4311051c358a
("i2c: irq: Remove IRQF_DISABLED") from Linus' tree and commit
f8420b7bf6ce ("fixup merge") from the bjdooks-i2c tree.
I fixed it up (by removing the IRQF_DISABLED flag) but this change should
probably be sent to Linus as it appears to have been fixed up incorrectly
there.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists