Skip to content

Commit

Permalink
Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/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
  • Loading branch information
torvalds committed Nov 19, 2011
2 parents 5c6b4e8 + 860ca0e commit c5e0c78
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
L: [email protected]
L: [email protected]
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
S: Maintained
F: include/linux/cgroup*
F: kernel/cgroup*
Expand Down

0 comments on commit c5e0c78

Please sign in to comment.