Tom Rini 41341221d1 Merge branch 'master' of git://git.denx.de/u-boot-arm ... Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR Conflicts: arch/arm/include/asm/arch-omap5/omap.h Signed-off-by: Tom Rini <trini@ti.com>		2013-06-13 15:16:15 -04:00
..
arm	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-06-13 15:16:15 -04:00
avr32	avr32: fix relocation address calculation	2013-05-13 10:35:12 +02:00
blackfin	bfin: Move gpio support for bf54x and bf60x into the generic driver folder.	2013-05-13 16:30:27 +08:00
m68k	m68k: Use image_setup_linux() instead of local code	2013-05-14 15:37:26 -04:00
microblaze	gpio: Add support for microblaze xilinx GPIO	2013-05-09 11:20:08 +02:00
mips	MIPS: asm/errno.h: switch to asm-generic/errno.h	2013-06-08 23:10:10 +02:00
nds32	nds32: Use sections header to obtain link symbols	2013-05-08 12:38:10 +08:00
nios2	lib: consolidate hang()	2013-05-01 16:41:08 -04:00
openrisc	openrisc: move board linker script(s) to a common in cpu/	2013-05-10 08:16:33 -04:00
powerpc	powerpc: fix 8xx and 82xx type-punning warnings with GCC 4.7	2013-06-11 22:01:45 +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	sparc: Use image_setup_linux() instead of local code	2013-05-14 15:37:26 -04:00
x86	x86: Add coreboot timestamps	2013-05-13 13:33:22 -07:00
.gitignore	update include/asm/ gitignore after move	2010-05-07 00:17:30 +02:00