diff --git a/[refs] b/[refs]
index 5107df5ca0ce..2500428870b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b463036ad7c6e9a74275f4f901acb3dbb74ec1ad
+refs/heads/master: 1f7df953d687860690cc0e388d0efec215c09e9c
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index cb009e4b2297..28167d0f8b42 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2631,6 +2631,18 @@ T:	git git://git.alsa-project.org/alsa-kernel.git
 S:	Maintained
 F:	sound/usb/misc/ua101.c
 
+EXTENSIBLE FIRMWARE INTERFACE (EFI)
+M:	Matt Fleming <matt.fleming@intel.com>
+L:	linux-efi@vger.kernel.org
+S:	Maintained
+F:	Documentation/x86/efi-stub.txt
+F:	arch/ia64/kernel/efi.c
+F:	arch/x86/boot/compressed/eboot.[ch]
+F:	arch/x86/include/asm/efi.h
+F:	arch/x86/platform/efi/*
+F:	drivers/firmware/efivars.c
+F:	include/linux/efi*.h
+
 EFIFB FRAMEBUFFER DRIVER
 L:	linux-fbdev@vger.kernel.org
 M:	Peter Jones <pjones@redhat.com>