barebox

Author	SHA1	Message	Date
Sascha Hauer	40a5f3de4e	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>	2009-10-28 10:10:56 +01:00
Jean-Christophe PLAGNIOL-VILLARD	f6a579da9c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>	2009-10-22 14:21:25 +02:00