---

yaml --- r: 263333 b: refs/heads/master c: 4733123 h: refs/heads/master i: 263331: 1fa5ef4 v: v3
git-mirror · Aug 25, 2011 · 18f0bf0 · 18f0bf0
1 parent bbc01b0
commit 18f0bf0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f51bdd2e97098a5cbb3cba7c3a56fa0e9ac3c444
+refs/heads/master: 47331231bb997a8adb79774fc4cf4bb48fe4e00a
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1883,7 +1883,7 @@ S:	Maintained
 F:	drivers/connector/
 
 CONTROL GROUPS (CGROUPS)
-M:	Paul Menage <menage@google.com>
+M:	Paul Menage <paul@paulmenage.org>
 M:	Li Zefan <lizf@cn.fujitsu.com>
 L:	containers@lists.linux-foundation.org
 S:	Maintained
@@ -1932,7 +1932,7 @@ S:	Maintained
 F:	tools/power/cpupower
 
 CPUSETS
-M:	Paul Menage <menage@google.com>
+M:	Paul Menage <paul@paulmenage.org>
 W:	http://www.bullopensource.org/cpuset/
 W:	http://oss.sgi.com/projects/cpusets/
 S:	Supported