[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20120731124845.81837e64e22f78795a9e7dab@canb.auug.org.au>
Date: Tue, 31 Jul 2012 12:48:45 +1000
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,
Benoit Cousson <b-cousson@...com>,
Grant Likely <grant.likely@...retlab.ca>,
Rob Herring <rob.herring@...xeda.com>,
Jean Delvare <khali@...ux-fr.org>,
Wolfram Sang <w.sang@...gutronix.de>
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-omap.c between various commits from Linus' tree
and commit d06333b7a618 ("i2c: OMAP: Add DT support for i2c controller")
from the bjdooks-i2c tree.
This was a complex conflict and since the bjdooks-i2c tree has not been
updated since May 3 and I have been unable to access it for some time, I
just dropped it for today.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists