summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-18 22:23:23 -0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-18 22:23:23 -0200
commitc5e0c7825d3a14c2dfc383763393f0bcb5400aa6 (patch)
tree90210990f447609188e5dceaf087c6c8cca2f535 /fs
parent5c6b4e84cbc59996bb14f88d997870751d675f3f (diff)
parent860ca0e6f72d21ded33ce14be9a53eb103f88441 (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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions