summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-10-26 10:17:38 +0200
committerIngo Molnar <mingo@kernel.org>2012-10-26 10:17:38 +0200
commit8b724e2a12d553cad8ad412846511c783a92d25e (patch)
treea07e14802a768a7156f70e2f9550ff98fe2b17f1 /MAINTAINERS
parentf82f64dd9f485e13f29f369772d4a0e868e5633a (diff)
parent5189c2a7c7769ee9d037d76c1a7b8550ccf3481c (diff)
downloadlinux-8b724e2a12d553cad8ad412846511c783a92d25e.tar.bz2
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--MAINTAINERS1
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
EXTENSIBLE FIRMWARE INTERFACE (EFI)
M: Matt Fleming <matt.fleming@intel.com>
L: linux-efi@vger.kernel.org
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
S: Maintained
F: Documentation/x86/efi-stub.txt
F: arch/ia64/kernel/efi.c