Albert ARIBAUD ab6423cae0 Merge branch 'u-boot/master' into 'u-boot-arm/master' ... Trivial merge conflict, needed to manually remove local_info as per commit 41364f0f. Conflicts: board/samsung/common/board.c		2014-03-25 10:53:15 +01:00
..
arc	kbuild: delete redundant LDSCRIPT definition	2014-03-12 17:04:46 -04:00
arm	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2014-03-25 10:53:15 +01:00
avr32	kbuild: fix CROSS_COMPILE settings in config.mk	2014-03-04 12:15:30 -05:00
blackfin	kbuild: improve Kbuild speed	2014-03-07 10:59:06 -05:00
m68k	kbuild: rename OBJTREE to objtree	2014-03-12 17:04:58 -04:00
microblaze	kbuild: delete redundant LDSCRIPT definition	2014-03-12 17:04:46 -04:00
mips	usb: create common header virtual root hub descriptors	2014-03-10 18:53:36 +01:00
nds32	config.mk: specify the exact path to standalone linker script	2014-03-07 10:59:06 -05:00
nios2	kbuild: fix CROSS_COMPILE settings in config.mk	2014-03-04 12:15:30 -05:00
openrisc	kbuild: delete redundant LDSCRIPT definition	2014-03-12 17:04:46 -04:00
powerpc	kbuild: rename OBJTREE to objtree	2014-03-12 17:04:58 -04:00
sandbox	sandbox: Add options to clean up temporary files	2014-03-17 20:05:49 -06:00
sh	sh: fix PFC registers definition for SH772{2, 3, 4}	2014-03-14 14:49:54 +09:00
sparc	usb: create common header virtual root hub descriptors	2014-03-10 18:53:36 +01:00
x86	x86: specify CONFIG_USE_PRIVATE_LIBGCC more simply	2014-03-12 17:04:45 -04:00
.gitignore	update include/asm/ gitignore after move	2010-05-07 00:17:30 +02:00