Conflicts: arch/arm/cpu/start-reset.c arch/arm/include/asm/barebox-arm.h arch/arm/mach-omap/Kconfig arch/arm/mach-omap/omap3_core.S |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
cache-armv4.S | ||
cache-armv5.S | ||
cache-armv6.S | ||
cache-armv7.S | ||
cache-l2x0.c | ||
cpu.c | ||
cpuinfo.c | ||
exceptions.S | ||
interrupts.c | ||
mmu.c | ||
mmu.h | ||
mmuinfo.c | ||
start-pbl.c | ||
start.c |