Merge branch 'master' of git://git.denx.de/u-boot-mips
Conflict over SPDX changes means that one change was effectively dropped
as it was fixing typos in a removed hunk of text.
Conflicts:
arch/mips/cpu/mips64/start.S
Signed-off-by: NTom Rini <trini@ti.com>
Showing
arch/mips/include/asm/malta.h
0 → 100644
board/qemu-malta/Makefile
0 → 100644
board/qemu-malta/lowlevel_init.S
0 → 100644
board/qemu-malta/qemu-malta.c
0 → 100644
drivers/pci/pci_gt64120.c
0 → 100644
include/configs/qemu-malta.h
0 → 100644
include/gt64120.h
0 → 100644
include/pci_gt64120.h
0 → 100644
想要评论请 注册 或 登录