diff --git a/[refs] b/[refs]
index 6239b810bedc..3da66896d13d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3e89cc535223433a619d0969db3fa05cdd946b8
+refs/heads/master: 3256f80fbbc25bd2504bd564844c615227621e56
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 6d1814857a58..297a052824fd 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -3520,7 +3520,7 @@ F:	drivers/hwmon/jc42.c
 F:	Documentation/hwmon/jc42
 
 JFS FILESYSTEM
-M:	Dave Kleikamp <shaggy@linux.vnet.ibm.com>
+M:	Dave Kleikamp <shaggy@kernel.org>
 L:	jfs-discussion@lists.sourceforge.net
 W:	http://jfs.sourceforge.net/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git