Conflicts: arch/mips/boards/qemu-malta/init.c commands/bootm.c drivers/of/base.c |
||
---|---|---|
.. | ||
env | ||
Kconfig | ||
Makefile | ||
config.h | ||
development-board.c | ||
lowlevel.c | ||
tiny6410.c | ||
tiny6410.h |
Conflicts: arch/mips/boards/qemu-malta/init.c commands/bootm.c drivers/of/base.c |
||
---|---|---|
.. | ||
env | ||
Kconfig | ||
Makefile | ||
config.h | ||
development-board.c | ||
lowlevel.c | ||
tiny6410.c | ||
tiny6410.h |