diff --git a/[refs] b/[refs]
index 3efba13f9f07..e25622e97c46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccd1443b5a5eaf41b1ff52e638cb45f094382746
+refs/heads/master: c4e1608ef4b2ab4f6974fa351bb6c92e1de59aa7
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 231bda28c428..b03014d8357c 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2544,7 +2544,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
 
@@ -3296,9 +3296,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