diff options
author | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 16:33:43 +0200 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 16:37:41 +0200 |
commit | 95bb335c0ebe96afe926387a1ef3a096bd884a82 (patch) | |
tree | 56115332b4f2f7ef300c36248a6a7d20db2e639d /MAINTAINERS | |
parent | [SCSI] libsas: fix deref before check in commit 70b25f890ce (diff) | |
parent | [SCSI] aacraid: add an ifdef'd device delete case instead of taking the devic... (diff) | |
download | linux-95bb335c0ebe96afe926387a1ef3a096bd884a82.tar.xz linux-95bb335c0ebe96afe926387a1ef3a096bd884a82.zip |
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d329b053a718..3c41de95a33d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -131,19 +131,12 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/typhoon* -3W-9XXX SATA-RAID CONTROLLER DRIVER -M: Adam Radford <linuxraid@amcc.com> +3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS) +M: Adam Radford <linuxraid@lsi.com> L: linux-scsi@vger.kernel.org -W: http://www.amcc.com +W: http://www.lsi.com S: Supported -F: drivers/scsi/3w-9xxx* - -3W-XXXX ATA-RAID CONTROLLER DRIVER -M: Adam Radford <linuxraid@amcc.com> -L: linux-scsi@vger.kernel.org -W: http://www.amcc.com -S: Supported -F: drivers/scsi/3w-xxxx* +F: drivers/scsi/3w-* 53C700 AND 53C700-66 SCSI DRIVER M: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> @@ -4577,6 +4570,14 @@ S: Supported F: Documentation/scsi/LICENSE.qla2xxx F: drivers/scsi/qla2xxx/ +QLOGIC QLA4XXX iSCSI DRIVER +M: Ravi Anand <ravi.anand@qlogic.com> +M: Vikas Chaudhary <vikas.chaudhary@qlogic.com> +M: iscsi-driver@qlogic.com +L: linux-scsi@vger.kernel.org +S: Supported +F: drivers/scsi/qla4xxx/ + QLOGIC QLA3XXX NETWORK DRIVER M: Ron Mercer <ron.mercer@qlogic.com> M: linux-driver@qlogic.com |