Ingo Molnar ef0b8b9a52 Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts ...

Conflicts:
	arch/x86/platform/efi/efi.c
	drivers/firmware/efi/Kconfig

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2014-01-05 12:34:29 +01:00

26 KiB

Raw Blame History

View Raw