diff --git a/[refs] b/[refs] index eaaa2e550da6..650b095fda8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f51bdd2e97098a5cbb3cba7c3a56fa0e9ac3c444 +refs/heads/master: 47331231bb997a8adb79774fc4cf4bb48fe4e00a diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index ee0ac2c98bef..d94292065359 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1883,7 +1883,7 @@ S: Maintained F: drivers/connector/ CONTROL GROUPS (CGROUPS) -M: Paul Menage +M: Paul Menage M: Li Zefan L: containers@lists.linux-foundation.org S: Maintained @@ -1932,7 +1932,7 @@ S: Maintained F: tools/power/cpupower CPUSETS -M: Paul Menage +M: Paul Menage W: http://www.bullopensource.org/cpuset/ W: http://oss.sgi.com/projects/cpusets/ S: Supported