Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts (ef0b8b9a) · Commits · Jason Kridner / Linux

Commit ef0b8b9a authored 11 years ago by

Ingo Molnar


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

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

Showing with 209 additions and 55 deletions

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