diff --git a/[refs] b/[refs]
index f77107a3a708..cdc89f2dbd00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef0e9180d3589ad35eefe9be6b239f32719fd548
+refs/heads/master: bfcc6e2eca507819e297a4c758ebd6b26e625330
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index d5b0b1b6dc52..d329b053a718 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -5492,7 +5492,7 @@ S:	Maintained
 F:	drivers/mmc/host/tmio_mmc.*
 
 TMPFS (SHMEM FILESYSTEM)
-M:	Hugh Dickins <hugh.dickins@tiscali.co.uk>
+M:	Hugh Dickins <hughd@google.com>
 L:	linux-mm@kvack.org
 S:	Maintained
 F:	include/linux/shmem_fs.h