Merge remote-tracking branch 'mkp-scsi/4.10/scsi-fixes' into fixes

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c7b8cf1240d9f82bcad3e2a57d785c8bcf2095c2..cfff2c9e3d9470550fd47dcd7b2638c77121c607 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -143,7 +143,7 @@ S:  Maintained
 F:     drivers/net/ethernet/3com/typhoon*
 
 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)
-M:     Adam Radford <linuxraid@lsi.com>
+M:     Adam Radford <aradford@gmail.com>
 L:     linux-scsi@vger.kernel.org
 W:     http://www.lsi.com
 S:     Supported
@@ -5735,7 +5735,7 @@ S:        Maintained
 F:     drivers/media/dvb-frontends/hd29l2*
 
 HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
-M:     Brian Boylston <brian.boylston@hpe.com>
+M:     Jimmy Vance <jimmy.vance@hpe.com>
 S:     Supported
 F:     Documentation/watchdog/hpwdt.txt
 F:     drivers/watchdog/hpwdt.c
@@ -8828,7 +8828,7 @@ T:        git git://github.com/jonmason/ntb.git
 F:     drivers/ntb/hw/intel/
 
 NTB AMD DRIVER
-M:     Xiangliang Yu <Xiangliang.Yu@amd.com>
+M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 L:     linux-ntb@googlegroups.com
 S:     Supported
 F:     drivers/ntb/hw/amd/
@@ -10136,6 +10136,12 @@ F:     drivers/net/ethernet/qlogic/qed/
 F:     include/linux/qed/
 F:     drivers/net/ethernet/qlogic/qede/
 
+QLOGIC QL41xxx ISCSI DRIVER
+M:     QLogic-Storage-Upstream@cavium.com
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/qedi/
+
 QNX4 FILESYSTEM
 M:     Anders Larsen <al@alarsen.net>
 W:     http://www.alarsen.net/linux/qnx4fs/