Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 012fa837845d1e8a21f9ec1c829a074be8b37493..12cee3da2625f48ad5564892026c7873c9123184 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -297,6 +297,12 @@ P: Colin Leroy
 M:     colin@colino.net
 S:     Maintained
 
+ADVANSYS SCSI DRIVER
+P:     Matthew Wilcox
+M:     matthew@wil.cx
+L:     linux-scsi@vger.kernel.org
+S:     Maintained
+
 AEDSP16 DRIVER
 P:     Riccardo Facchetti
 M:     fizban@tin.it
@@ -1889,6 +1895,11 @@ M:       Gadi Oxman <gadio@netvision.net.il>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
+IDE-SCSI DRIVER
+L:     linux-ide@vger.kernel.org
+L:     linux-scsi@vger.kernel.org
+S:     Orphan
+
 IEEE 1394 SUBSYSTEM
 P:     Ben Collins
 M:     ben.collins@ubuntu.com
@@ -2404,7 +2415,7 @@ LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 P:     Eric Moore
 M:     Eric.Moore@lsi.com
 M:     support@lsi.com
-L:     mpt_linux_developer@lsi.com
+L:     DL-MPTFusionLinux@lsi.com
 L:     linux-scsi@vger.kernel.org
 W:     http://www.lsilogic.com/support
 S:     Supported