d4bbf7e775
Conflicts & resolutions: * arch/x86/xen/setup.c |
||
---|---|---|
.. | ||
efi_32.c | ||
efi_64.c | ||
efi_stub_32.S | ||
efi_stub_64.S | ||
efi.c | ||
Makefile |
d4bbf7e775
Conflicts & resolutions: * arch/x86/xen/setup.c |
||
---|---|---|
.. | ||
efi_32.c | ||
efi_64.c | ||
efi_stub_32.S | ||
efi_stub_64.S | ||
efi.c | ||
Makefile |