summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-18 15:26:52 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-18 15:26:52 +1200
commit901b2082b51d4f1c6deac5d5264a744b793ed46f (patch)
tree427a29264d6e45e30ec4cf16aea0c9c196f914ca /MAINTAINERS
parent298e320431db1db52b9ddd6f242bb33a4ea2d094 (diff)
parent70a0f2c1898c6abf53670e55642b6e840b003892 (diff)
downloadlinux-901b2082b51d4f1c6deac5d5264a744b793ed46f.tar.bz2
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley: "This is one fix for a Multiqueue sleeping in invalid context problem and a MAINTAINER file update for Qlogic" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: ->queue_rq can't sleep MAINTAINERS: Update maintainer list for qla4xxx
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5e61aef972ef..2fa385321245 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7747,8 +7747,7 @@ F: Documentation/scsi/LICENSE.qla2xxx
F: drivers/scsi/qla2xxx/
QLOGIC QLA4XXX iSCSI DRIVER
-M: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
-M: iscsi-driver@qlogic.com
+M: QLogic-Storage-Upstream@qlogic.com
L: linux-scsi@vger.kernel.org
S: Supported
F: Documentation/scsi/LICENSE.qla4xxx