]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
cgroup: Merge branch 'for-3.11-fixes' into for-3.12
authorTejun Heo <tj@kernel.org>
Fri, 2 Aug 2013 20:12:13 +0000 (16:12 -0400)
committerTejun Heo <tj@kernel.org>
Fri, 2 Aug 2013 20:12:13 +0000 (16:12 -0400)
commit61584e3f4964995e575618f76ff7197123796e75
treec43a31c30b23d5e576f2f52983cda804036ed389
parentb395890a092d8ecbe54f005179e3dec4b6bf752a
parentda0a12caffad2eeadea429f83818408e7b77379a
cgroup: Merge branch 'for-3.11-fixes' into for-3.12

for-3.12 branch is about to receive invasive updates which are
dependent on da0a12caff ("cgroup: fix a leak when percpu_ref_init()
fails").  Given the amount of scheduled changes, I think it'd less
painful to pull in for-3.11-fixes as preparation.  Pull in
for-3.11-fixes into for-3.12.

Signed-off-by: Tejun Heo <tj@kernel.org>
include/linux/cgroup.h
kernel/cgroup.c