Merge remote-tracking branch 'scsi/for-next'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c564fdbcc59be47e003c98d467b170480e21eebe..3192a4d78cce422862ef05f790d5fe439d52c384 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4371,7 +4371,7 @@ S:        Supported
 F:     drivers/crypto/nx/
 
 IBM Power 842 compression accelerator
-M:     Robert Jennings <rcj@linux.vnet.ibm.com>
+M:     Nathan Fontenot <nfont@linux.vnet.ibm.com>
 S:     Supported
 F:     drivers/crypto/nx/nx-842.c
 F:     include/linux/nx842.h
@@ -4387,12 +4387,18 @@ 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>
+IBM Power Virtual SCSI Device Drivers
+M:     Nathan Fontenot <nfont@linux.vnet.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
-F:     drivers/scsi/ibmvscsi/
-X:     drivers/scsi/ibmvscsi/ibmvstgt.c
+F:     drivers/scsi/ibmvscsi/ibmvscsi*
+F:     drivers/scsi/ibmvscsi/viosrp.h
+
+IBM Power Virtual FC Device Drivers
+M:     Brian King <brking@linux.vnet.ibm.com>
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/ibmvscsi/ibmvfc*
 
 IBM ServeRAID RAID DRIVER
 P:     Jack Hammer
@@ -6010,6 +6016,28 @@ M:       Petr Vandrovec <petr@vandrovec.name>
 S:     Odd Fixes
 F:     fs/ncpfs/
 
+NCR 5380 SCSI DRIVERS
+M:     Finn Thain <fthain@telegraphics.com.au>
+M:     Michael Schmitz <schmitzmic@gmail.com>
+L:     linux-scsi@vger.kernel.org
+S:     Maintained
+F:     Documentation/scsi/g_NCR5380.txt
+F:     drivers/scsi/NCR5380.*
+F:     drivers/scsi/arm/cumana_1.c
+F:     drivers/scsi/arm/oak.c
+F:     drivers/scsi/atari_NCR5380.c
+F:     drivers/scsi/atari_scsi.*
+F:     drivers/scsi/dmx3191d.c
+F:     drivers/scsi/dtc.*
+F:     drivers/scsi/g_NCR5380.*
+F:     drivers/scsi/g_NCR5380_mmio.c
+F:     drivers/scsi/mac_scsi.*
+F:     drivers/scsi/pas16.*
+F:     drivers/scsi/sun3_NCR5380.c
+F:     drivers/scsi/sun3_scsi.*
+F:     drivers/scsi/sun3_scsi_vme.c
+F:     drivers/scsi/t128.*
+
 NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
 M:     "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 L:     linux-scsi@vger.kernel.org