diff --git a/[refs] b/[refs]
index 69b694936ec0..c2d1e7124836 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fad4dab5e44e10acf6b0235e469cb8e773b58e31
+refs/heads/master: c95286d81b976f4224c7b153defc8eec07e837d9
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 1868aafae968..c12c0c746cbf 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -5494,7 +5494,7 @@ F:	drivers/scsi/sg.c
 F:	include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:	"James E.J. Bottomley" <James.Bottomley@suse.de>
+M:	"James E.J. Bottomley" <JBottomley@parallels.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