Conflicts: arch/x86/kernel/setup.c arch/x86/platform/efi/efi.c arch/x86/platform/efi/efi_64.c |
||
---|---|---|
.. | ||
cper.c | ||
efi-pstore.c | ||
efi-stub-helper.c | ||
efi.c | ||
efivars.c | ||
Kconfig | ||
Makefile | ||
runtime-map.c | ||
vars.c |
Conflicts: arch/x86/kernel/setup.c arch/x86/platform/efi/efi.c arch/x86/platform/efi/efi_64.c |
||
---|---|---|
.. | ||
cper.c | ||
efi-pstore.c | ||
efi-stub-helper.c | ||
efi.c | ||
efivars.c | ||
Kconfig | ||
Makefile | ||
runtime-map.c | ||
vars.c |