diff --git a/[refs] b/[refs]
index 92d3135fd30c..cdb897f68cff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4c576b911e364737b1bf4f5bfdab1c440713f26
+refs/heads/master: 6bffd7b57d747d74ec2962d7c822f4b86e9f64d4
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index c3a533d5d382..dcbd7b24f3d6 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1196,9 +1196,9 @@ S:	Maintained
 
 CPUSETS
 P:	Paul Jackson
-P:	Simon Derr
+P:	Paul Menage
 M:	pj@sgi.com
-M:	simon.derr@bull.net
+M:	menage@google.com
 L:	linux-kernel@vger.kernel.org
 W:	http://www.bullopensource.org/cpuset/
 S:	Supported