diff --git a/[refs] b/[refs] index 577b7b11e0d2..b6e074816300 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c431069fe4bacc0cd3ca94a8453987140a5b3517 +refs/heads/master: f47b89c73ce7535339525c141a6a114db333f0bd diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index fa309ab7ccbf..d58bc1222b57 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2128,10 +2128,10 @@ S: Maintained F: tools/power/cpupower CPUSETS -M: Paul Menage +M: Li Zefan W: http://www.bullopensource.org/cpuset/ W: http://oss.sgi.com/projects/cpusets/ -S: Supported +S: Maintained F: Documentation/cgroups/cpusets.txt F: include/linux/cpuset.h F: kernel/cpuset.c