[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20091201123738.73bd4e4f.sfr@canb.auug.org.au>
Date: Tue, 1 Dec 2009 12:37:38 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Woodhouse <dwmw2@...radead.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
David Hunter <hunterd42@...il.com>,
Haojian Zhuang <haojian.zhuang@...vell.com>,
Eric Miao <eric.y.miao@...il.com>
Subject: linux-next: manual merge of the mtd tree with the pxa tree
Hi David,
Today's linux-next merge of the mtd tree got a conflict in drivers/mtd/nand/pxa3xx_nand.c between commit f923cfbd298a3c5d05fe20712765ed73387b4b3c ("pxa3xx_nand: fix memory out of bound") from the pxa tree and commit 98ecc914d0a48dbbcbb5fc866ab5b59a52afbd41 ("mtd: pxa3xx_nand: Fix PIO data transfer") from the mtd tree.
They seem to be doing the same thing but differently. I just kept the
version from the pxa tree.
--
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