diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 13:03:37 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 13:03:37 +1100 |
| commit | afc96cef793d3459d8c3f6629122f802e2fe4f45 (patch) | |
| tree | b68b60315e3c68d725cb83f808aaaad4944a2a35 /MAINTAINERS | |
| parent | 93225bd763390d8fad2f825aa591507db4ea404b (diff) | |
| parent | 6503605f1fe2918efa91a83801007e91d6241414 (diff) | |
Merge remote-tracking branch 'cgroup/for-next'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6cfe1db25a31..3c2127dff5a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2193,10 +2193,10 @@ S: Maintained F: tools/power/cpupower CPUSETS -M: Paul Menage <paul@paulmenage.org> +M: Li Zefan <lizefan@huawei.com> 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 |