]> Pileus Git - ~andy/linux/commit
Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Sun, 5 Jan 2014 11:34:29 +0000 (12:34 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 5 Jan 2014 11:34:29 +0000 (12:34 +0100)
commitef0b8b9a521c65201bfca9747ee1bf374296133c
tree644c3390c07d06fb7807182a4935f7c3f675b157
parent5c12af0c41e3417e1939095325920463b5f8e726
parentd6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc
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>
Documentation/kernel-parameters.txt
arch/x86/platform/efi/efi.c
drivers/firmware/efi/Kconfig
drivers/firmware/efi/Makefile
include/linux/efi.h