Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5e0c782 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

* 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: Replace Paul Menage with Tejun Heo as cgroups maintainer
parents 5c6b4e84 860ca0e6

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1927,10 +1927,11 @@ S: Maintained 
F:	drivers/connector/



CONTROL GROUPS (CGROUPS)

M:	Paul Menage <paul@paulmenage.org>

M:	Tejun Heo <tj@kernel.org>

M:	Li Zefan <lizf@cn.fujitsu.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:	include/linux/cgroup*

F:	kernel/cgroup*