Merge conflicts: ----------------- arch/x86/include/asm/efi.h - arch_efi_call_virt() macro keep undef of arch_efi_call_virt from HEAD(!1326) |
||
---|---|---|
.. | ||
fd | ||
fs | ||
Build | ||
Makefile | ||
cpu.c | ||
cpu.h | ||
debug-internal.h | ||
debug.c | ||
debug.h | ||
io.h |
Merge conflicts: ----------------- arch/x86/include/asm/efi.h - arch_efi_call_virt() macro keep undef of arch_efi_call_virt from HEAD(!1326) |
||
---|---|---|
.. | ||
fd | ||
fs | ||
Build | ||
Makefile | ||
cpu.c | ||
cpu.h | ||
debug-internal.h | ||
debug.c | ||
debug.h | ||
io.h |