u-boot/arch/arm/include
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
..
asm Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-06-13 15:16:15 -04:00