diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 22:23:23 -0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 22:23:23 -0200 |
| commit | c5e0c7825d3a14c2dfc383763393f0bcb5400aa6 (patch) | |
| tree | 90210990f447609188e5dceaf087c6c8cca2f535 | |
| parent | 5c6b4e84cbc59996bb14f88d997870751d675f3f (diff) | |
| parent | 860ca0e6f72d21ded33ce14be9a53eb103f88441 (diff) | |
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
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7f6bc290d455..78751bbfa91a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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* |