mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-12-11 12:31:56 +01:00
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>