Merge conflicts: ----------------- arch/x86/include/asm/efi.h - arch_efi_call_virt() macro keep undef of arch_efi_call_virt from HEAD(!1326) |
||
---|---|---|
.. | ||
ffs-aio-example | ||
usbip | ||
.gitignore | ||
Build | ||
Makefile | ||
ffs-test.c | ||
hcd-tests.sh | ||
testusb.c |
Merge conflicts: ----------------- arch/x86/include/asm/efi.h - arch_efi_call_virt() macro keep undef of arch_efi_call_virt from HEAD(!1326) |
||
---|---|---|
.. | ||
ffs-aio-example | ||
usbip | ||
.gitignore | ||
Build | ||
Makefile | ||
ffs-test.c | ||
hcd-tests.sh | ||
testusb.c |