Commit ef0b8b9a authored Jan 05, 2014 by Ingo Molnar

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>

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment