summaryrefslogtreecommitdiffstats
path: root/security/device_cgroup.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-08-02 16:12:13 -0400
committerTejun Heo <tj@kernel.org>2013-08-02 16:12:13 -0400
commit61584e3f4964995e575618f76ff7197123796e75 (patch)
treec43a31c30b23d5e576f2f52983cda804036ed389 /security/device_cgroup.c
parentb395890a092d8ecbe54f005179e3dec4b6bf752a (diff)
parentda0a12caffad2eeadea429f83818408e7b77379a (diff)
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>
Diffstat (limited to 'security/device_cgroup.c')
0 files changed, 0 insertions, 0 deletions