1 files changed, 22 insertions, 25 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1b22565c59ac..0fbd4a04407b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2384,16 +2384,35 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/connector/
 
-CONTROL GROUPS (CGROUPS)
+CONTROL GROUP (CGROUP)
 M:      Tejun Heo <tj@kernel.org>
 M:      Li Zefan <lizefan@huawei.com>
-L:      containers@lists.linux-foundation.org
 L:      cgroups@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:      Maintained
+F:      Documentation/cgroups/
 F:      include/linux/cgroup*
 F:      kernel/cgroup*
-F:      mm/*cgroup*
+
+CONTROL GROUP - CPUSET
+M:      Li Zefan <lizefan@huawei.com>
+L:      cgroups@vger.kernel.org
+W:      http://www.bullopensource.org/cpuset/
+W:      http://oss.sgi.com/projects/cpusets/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
+S:      Maintained
+F:      Documentation/cgroups/cpusets.txt
+F:      include/linux/cpuset.h
+F:      kernel/cpuset.c
+
+CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
+M:      Johannes Weiner <hannes@cmpxchg.org>
+M:      Michal Hocko <mhocko@suse.cz>
+L:      cgroups@vger.kernel.org
+L:      linux-mm@kvack.org
+S:      Maintained
+F:      mm/memcontrol.c
+F:      mm/page_cgroup.c
 
 CORETEMP HARDWARE MONITORING DRIVER
 M:      Fenghua Yu <fenghua.yu@intel.com>
@@ -2464,17 +2483,6 @@ M:	Thomas Renninger <trenn@suse.de>
 S:      Maintained
 F:      tools/power/cpupower/
 
-CPUSETS
-M:      Li Zefan <lizefan@huawei.com>
-L:      cgroups@vger.kernel.org
-W:      http://www.bullopensource.org/cpuset/
-W:      http://oss.sgi.com/projects/cpusets/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
-S:      Maintained
-F:      Documentation/cgroups/cpusets.txt
-F:      include/linux/cpuset.h
-F:      kernel/cpuset.c
-
 CRAMFS FILESYSTEM
 W:      http://sourceforge.net/projects/cramfs/
 S:      Orphan / Obsolete
@@ -5757,17 +5765,6 @@ F:	include/linux/memory_hotplug.h
 F:      include/linux/vmalloc.h
 F:      mm/
 
-MEMORY RESOURCE CONTROLLER
-M:      Johannes Weiner <hannes@cmpxchg.org>
-M:      Michal Hocko <mhocko@suse.cz>
-M:      Balbir Singh <bsingharora@gmail.com>
-M:      KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
-L:      cgroups@vger.kernel.org
-L:      linux-mm@kvack.org
-S:      Maintained
-F:      mm/memcontrol.c
-F:      mm/page_cgroup.c
-
 MEMORY TECHNOLOGY DEVICES (MTD)
 M:      David Woodhouse <dwmw2@infradead.org>
 M:      Brian Norris <computersforpeace@gmail.com>