* linux-next: manual merge of the mtd tree with the pxa tree
@ 2009-12-01 1:37 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2009-12-01 1:37 UTC (permalink / raw)
To: David Woodhouse
Cc: linux-next, linux-kernel, David Hunter, Haojian Zhuang, Eric Miao
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-12-01 1:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-01 1:37 linux-next: manual merge of the mtd tree with the pxa tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox