Merge tag 'v3.9' into efi-for-tip2

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8bdd7a7ef2f4687aa26ee66a70fe8ad428e14890..3a6b36c510833ad544d9e982c26c62c14517a5c5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2987,9 +2987,18 @@ 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:     drivers/firmware/efi/*
 F:     include/linux/efi*.h
 
+EFI VARIABLE FILESYSTEM
+M:     Matthew Garrett <matthew.garrett@nebula.com>
+M:     Jeremy Kerr <jk@ozlabs.org>
+M:     Matt Fleming <matt.fleming@intel.com>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
+L:     linux-efi@vger.kernel.org
+S:     Maintained
+F:     fs/efivarfs/
+
 EFIFB FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
 M:     Peter Jones <pjones@redhat.com>
@@ -6331,7 +6340,7 @@ S:        Maintained
 T:     git git://git.infradead.org/users/cbou/linux-pstore.git
 F:     fs/pstore/
 F:     include/linux/pstore*
-F:     drivers/firmware/efivars.c
+F:     drivers/firmware/efi/efi-pstore.c
 F:     drivers/acpi/apei/erst.c
 
 PTP HARDWARE CLOCK SUPPORT