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> |
||
|---|---|---|
| .. | ||
| clock.h | ||
| cpu.h | ||
| gpio.h | ||
| i2c.h | ||
| mmc_host_def.h | ||
| mux_dra7xx.h | ||
| mux_omap5.h | ||
| omap.h | ||
| spl.h | ||
| sys_proto.h | ||