summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-05 09:57:13 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-05 09:57:13 -0800
commitaac9e28d2f3d3c1eacc4114d685864a2a6423b80 (patch)
tree3075a2d4c70840c3b2f7173f95c0f278072db8b7 /MAINTAINERS
parent9f259cc59ba45b8db401d60be9700e275676fb15 (diff)
parent3c887e8a1a4553ae6263fc9490e33de213e3746f (diff)
downloadlinux-3.10-aac9e28d2f3d3c1eacc4114d685864a2a6423b80.tar.gz
linux-3.10-aac9e28d2f3d3c1eacc4114d685864a2a6423b80.tar.bz2
linux-3.10-aac9e28d2f3d3c1eacc4114d685864a2a6423b80.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] ibmvscsi: Prevent IO during partner login [SCSI] lpfc : Correct queue tag handling [SCSI] Update MAINTAINER email address and trees [SCSI] osst: fix if (...) \n #if... cases missing semicolons when false
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6c0e44bbf60..1c7c229a092 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2549,7 +2549,7 @@ S: Supported
MISCELLANEOUS MCA-SUPPORT
P: James Bottomley
-M: jejb@steeleye.com
+M: James.Bottomley@HansenPartnership.com
L: linux-kernel@vger.kernel.org
S: Maintained
@@ -3301,9 +3301,11 @@ S: Maintained
SCSI SUBSYSTEM
P: James E.J. Bottomley
-M: James.Bottomley@SteelEye.com
+M: James.Bottomley@HansenPartnership.com
L: linux-scsi@vger.kernel.org
T: git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
+T: git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
+T: git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git
S: Maintained
SCSI TAPE DRIVER