diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2012-10-26 10:17:38 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-10-26 10:17:38 +0200 |
| commit | 8b724e2a12d553cad8ad412846511c783a92d25e (patch) | |
| tree | a07e14802a768a7156f70e2f9550ff98fe2b17f1 /include | |
| parent | x86, mm: Undo incorrect revert in arch/x86/mm/init.c (diff) | |
| parent | x86: efi: Turn off efi_enabled after setup on mixed fw/kernel (diff) | |
| download | linux-dev-8b724e2a12d553cad8ad412846511c783a92d25e.tar.xz linux-dev-8b724e2a12d553cad8ad412846511c783a92d25e.zip | |
Merge tag 'efi-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
Pull EFI fixes from Matt Fleming:
"Fix oops with EFI variables on mixed 32/64-bit firmware/kernels and
document EFI git repository location on kernel.org."
Conflicts:
arch/x86/include/asm/efi.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions