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 |
||
---|---|---|
.. | ||
env | ||
Makefile | ||
board.c | ||
config.h | ||
lowlevel_init.S |
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 |
||
---|---|---|
.. | ||
env | ||
Makefile | ||
board.c | ||
config.h | ||
lowlevel_init.S |