Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index afb85976b1eb3ce4b753aee79b8fa047c5d3a47e..97d0b689270a82fe5cd19c3c2c8fc1f2afdc1caf 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
@@ -5080,9 +5080,11 @@ F:       drivers/net/wan/dlci.c
 F:     drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
+M:     Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 L:     linux-fbdev@vger.kernel.org
+T:     git git://github.com/bzolnier/linux.git
 Q:     http://patchwork.kernel.org/project/linux-fbdev/list/
-S:     Orphan
+S:     Maintained
 F:     Documentation/fb/
 F:     drivers/video/
 F:     include/video/
@@ -5735,7 +5737,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 +8830,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/
@@ -10141,6 +10143,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/