diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-10-26 04:17:38 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-10-26 04:17:38 -0400 |
| commit | 8b724e2a12d553cad8ad412846511c783a92d25e (patch) | |
| tree | a07e14802a768a7156f70e2f9550ff98fe2b17f1 /MAINTAINERS | |
| parent | f82f64dd9f485e13f29f369772d4a0e868e5633a (diff) | |
| parent | 5189c2a7c7769ee9d037d76c1a7b8550ccf3481c (diff) | |
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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 027ec2bfa135..f39a82dc0260 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2802,6 +2802,7 @@ F: sound/usb/misc/ua101.c | |||
| 2802 | EXTENSIBLE FIRMWARE INTERFACE (EFI) | 2802 | EXTENSIBLE FIRMWARE INTERFACE (EFI) |
| 2803 | M: Matt Fleming <matt.fleming@intel.com> | 2803 | M: Matt Fleming <matt.fleming@intel.com> |
| 2804 | L: linux-efi@vger.kernel.org | 2804 | L: linux-efi@vger.kernel.org |
| 2805 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git | ||
| 2805 | S: Maintained | 2806 | S: Maintained |
| 2806 | F: Documentation/x86/efi-stub.txt | 2807 | F: Documentation/x86/efi-stub.txt |
| 2807 | F: arch/ia64/kernel/efi.c | 2808 | F: arch/ia64/kernel/efi.c |