[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Fri, 9 Sep 2011 11:44:36 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Sascha Hauer <s.hauer@...gutronix.de>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Fabio Estevam <fabio.estevam@...escale.com>,
Arnd Bergmann <arnd@...db.de>,
"Uwe Kleine-König"
<u.kleine-koenig@...gutronix.de>,
"Arnaud Patard (Rtp)" <arnaud.patard@...-net.org>
Subject: linux-next: manual merge of the i.MX tree with the arm-soc tree
Hi Sascha,
Today's linux-next merge of the i.MX tree got a conflict in
arch/arm/plat-mxc/devices/platform-pata_imx.c between commit 236c4e8be436
("ARM: imx: Add PATA resources for other i.MX processors") from the
arm-soc tree and commit 8354b5d2a1c5 ("ARM: imx: Add PATA resources for
other i.MX processors") from the i.MX tree.
The latter appears to be a corrected version of the former (despite
having the same Author date ...) so I used that.
--
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