u-boot-brain/arch
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
..
arm Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' 2013-05-11 09:25:36 +02:00
avr32 lib: consolidate hang() 2013-05-01 16:41:08 -04:00
blackfin lib: consolidate hang() 2013-05-01 16:41:08 -04:00
m68k lib: consolidate hang() 2013-05-01 16:41:08 -04:00
microblaze lib: consolidate hang() 2013-05-01 16:41:08 -04:00
mips lib: consolidate hang() 2013-05-01 16:41:08 -04:00
nds32 lib: consolidate hang() 2013-05-01 16:41:08 -04:00
nios2 lib: consolidate hang() 2013-05-01 16:41:08 -04:00
openrisc lib: consolidate hang() 2013-05-01 16:41:08 -04:00
powerpc Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' 2013-05-11 09:25:36 +02:00
sandbox sandbox: Allow -c argument to provide a command list 2013-05-01 11:17:21 -04:00
sh lib: consolidate hang() 2013-05-01 16:41:08 -04:00
sparc lib: consolidate hang() 2013-05-01 16:41:08 -04:00
x86 lib: consolidate hang() 2013-05-01 16:41:08 -04:00
.gitignore update include/asm/ gitignore after move 2010-05-07 00:17:30 +02:00