Conflicts:
	arch/x86/platform/efi/efi.c
	drivers/firmware/efi/Kconfig
Signed-off-by: Ingo Molnar <mingo@kernel.org>