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)
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>
1  2 
include/linux/cgroup.h
kernel/cgroup.c

Simple merge
diff --cc kernel/cgroup.c
Simple merge