sections: fix section conflicts in drivers/net

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8c22b7f6f41ab3bef0007731e277adf1be252aa9..f883fc1b1b46aeee041dbd0ab4db221ec41311c6 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>
@@ -3427,6 +3438,18 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 S:     Maintained
 F:     arch/ia64/
 
+IBM Power in-Nest Crypto Acceleration
+M:     Kent Yoder <key@linux.vnet.ibm.com>
+L:     linux-crypto@vger.kernel.org
+S:     Supported
+F:     drivers/crypto/nx/
+
+IBM Power 842 compression accelerator
+M:     Robert Jennings <rcj@linux.vnet.ibm.com>
+S:     Supported
+F:     drivers/crypto/nx/nx-842.c
+F:     include/linux/nx842.h
+
 IBM Power Linux RAID adapter
 M:     Brian King <brking@us.ibm.com>
 S:     Supported
@@ -3438,6 +3461,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>
@@ -4806,6 +4836,7 @@ M:        Lauro Ramos Venancio <lauro.venancio@openbossa.org>
 M:     Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
 M:     Samuel Ortiz <sameo@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
+L:     linux-nfc@lists.01.org (moderated for non-subscribers)
 S:     Maintained
 F:     net/nfc/
 F:     include/linux/nfc.h
@@ -5048,6 +5079,7 @@ S:        Maintained
 F:     Documentation/devicetree
 F:     drivers/of
 F:     include/linux/of*.h
+F:     scripts/dtc
 K:     of_get_property
 K:     of_match_table