u-boot-brain/arch/powerpc
Albert ARIBAUD ec7023db8d Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
	drivers/mtd/nand/mxc_nand_spl.c
	include/configs/m28evk.h
2013-05-11 09:25:36 +02:00
..
cpu Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' 2013-05-11 09:25:36 +02:00
include/asm Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' 2013-05-11 09:25:36 +02:00
lib lib: consolidate hang() 2013-05-01 16:41:08 -04:00
config.mk ppc: Enable generic board support 2013-03-15 16:14:00 -04:00