41341221d1
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> |
||
---|---|---|
.. | ||
cpu | ||
dts | ||
imx-common | ||
include/asm | ||
lib | ||
config.mk |