[PATCH 17/20] pxa3xx_nand: add cmdline part parser support

[David Woodhouse]

On Thu, 2010-05-06 at 05:12 -0400, Haojian Zhuang wrote:
> From c81c53e24bbbe29ab4bf9767d24de8c45a4470b9 Mon Sep 17 00:00:00 2001
> From: Lei Wen <leiwen at marvell.com>
> Date: Thu, 6 May 2010 10:42:13 +0800
> Subject: [PATCH] pxa3xx_nand: add cmdline part parser support
> 
> Signed-off-by: Lei Wen <leiwen at marvell.com>
> Signed-off-by: Haojian Zhuang <haojian.zhuang at marvell.com>
> ---
>  drivers/mtd/nand/pxa3xx_nand.c |   26 ++++++++++++++++++++++++--
>  1 files changed, 24 insertions(+), 2 deletions(-)

This conflicts with commit bff3c10d369440bc87ba612b45ba2777d2bf017f.

Some of the other patches in this sequence don't apply cleanly to the
current mtd-2.6.git tree either; please could you refresh?

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse at intel.com                              Intel Corporation