Merge branch 'for-sascha' of git://uboot.jcrosoft.org/u-boot-v2 into from-jean
...
Conflicts:
board/a9m2440/a9m2440.c
board/pcm043/pcm043.c
drivers/nand/nand_imx.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer
committed
on 28 Oct 2009