diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-01-22 09:57:27 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-01-22 09:57:27 -0800 |
| commit | 4b1a9a5e40210cb4a0687806d3b631f7db4b9b0e (patch) | |
| tree | 4f33f3af2e1ff163c6f4a1022d1d6b6be7b11547 /MAINTAINERS | |
| parent | dcaf9aed995c2b2a49fb86bbbcfa2f92c797ab5d (diff) | |
| parent | 3ce438df106826edde7ad724f3819716a3f0cf56 (diff) | |
| download | linux-4b1a9a5e40210cb4a0687806d3b631f7db4b9b0e.tar.gz linux-4b1a9a5e40210cb4a0687806d3b631f7db4b9b0e.tar.bz2 linux-4b1a9a5e40210cb4a0687806d3b631f7db4b9b0e.zip | |
Merge branch 'misc' into for-linus
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1344816c4c06..82492de5919f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -484,7 +484,6 @@ M: Hannes Reinecke <hare@suse.de> L: linux-scsi@vger.kernel.org S: Maintained F: drivers/scsi/aic7xxx/ -F: drivers/scsi/aic7xxx_old/ AIMSLAB FM RADIO RECEIVER DRIVER M: Hans Verkuil <hverkuil@xs4all.nl> @@ -6901,8 +6900,7 @@ S: Maintained F: drivers/scsi/qla1280.[ch] QLOGIC QLA2XXX FC-SCSI DRIVER -M: Andrew Vasquez <andrew.vasquez@qlogic.com> -M: linux-driver@qlogic.com +M: qla2xxx-upstream@qlogic.com L: linux-scsi@vger.kernel.org S: Supported F: Documentation/scsi/LICENSE.qla2xxx @@ -7456,8 +7454,9 @@ F: include/scsi/srp.h SCSI SG DRIVER M: Doug Gilbert <dgilbert@interlog.com> L: linux-scsi@vger.kernel.org -W: http://www.torque.net/sg +W: http://sg.danny.cz/sg S: Maintained +F: Documentation/scsi/scsi-generic.txt F: drivers/scsi/sg.c F: include/scsi/sg.h |