Merge tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy

[linux-beck.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 78336396a432e0a076a9cda21a60cc483c33497e..28167d0f8b4298d0f3a13508497866a4f0534200 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1650,7 +1650,6 @@ F:        drivers/bcma/
 F:     include/linux/bcma/
 
 BROCADE BFA FC SCSI DRIVER
-M:     Jing Huang <huangj@brocade.com>
 M:     Krishna C Gudipati <kgudipat@brocade.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
@@ -2632,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>
@@ -3438,6 +3449,13 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmveth.*
 
+IBM Power Virtual SCSI/FC Device Drivers
+M:     Robert Jennings <rcj@linux.vnet.ibm.com>
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/ibmvscsi/
+X:     drivers/scsi/ibmvscsi/ibmvstgt.c
+
 IBM ServeRAID RAID DRIVER
 P:     Jack Hammer
 M:     Dave Jeffery <ipslinux@adaptec.com>