diff --git a/[refs] b/[refs]
index 087e7ef23821..1b9540483751 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ea0696e9251c2283d3d306c6b096e71cf6a60c0
+refs/heads/master: 60df75c169c5d42f4eef03d80e65c3fe223a1620
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 60299a9a7adb..b841e3c20e9b 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -4408,7 +4408,7 @@ F:	drivers/scsi/sg.c
 F:	include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
+M:	"James E.J. Bottomley" <James.Bottomley@suse.de>
 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