Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 56a432d511194723266957d3ef080783dd3d53b1..f40881b5ad20ca75270f8ae0bb37b4693044f1ca 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8653,11 +8653,9 @@ F:       drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:     "James E.J. Bottomley" <JBottomley@parallels.com>
+M:     "James E.J. Bottomley" <JBottomley@odin.com>
 L:     linux-scsi@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 S:     Maintained
 F:     drivers/scsi/
 F:     include/scsi/