diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-05 09:26:44 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-05 09:26:44 +1000 |
| commit | 53822b5d574f1c596ce52b5371dc51b54b94b614 (patch) | |
| tree | 7b3756f2fbd669d28038d79d1d77b925a7b57392 /MAINTAINERS | |
| parent | f79ee80e320ce7e3530d2ea2fc1a266949608cd7 (diff) | |
| parent | b1de6ab79456724d316d5dfa4bbb28f166cda99e (diff) | |
Merge remote branch 'scsi/master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 492280b4abb9..693258c37607 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> @@ -4588,6 +4581,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 |