From: Linus Torvalds Date: Fri, 10 Oct 2014 11:24:40 +0000 (-0400) Subject: Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup X-Git-Tag: v3.18-rc1~106 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b211e9d7c861bdb37b86d6384da9edfb80949ceb;p=linux-2.6-block.git Merge branch 'for-3.18' of git://git./linux/kernel/git/tj/cgroup Pull cgroup updates from Tejun Heo: "Nothing too interesting. Just a handful of cleanup patches" * 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: Revert "cgroup: remove redundant variable in cgroup_mount()" cgroup: remove redundant variable in cgroup_mount() cgroup: fix missing unlock in cgroup_release_agent() cgroup: remove CGRP_RELEASABLE flag perf/cgroup: Remove perf_put_cgroup() cgroup: remove redundant check in cgroup_ino() cpuset: simplify proc_cpuset_show() cgroup: simplify proc_cgroup_show() cgroup: use a per-cgroup work for release agent cgroup: remove bogus comments cgroup: remove redundant code in cgroup_rmdir() cgroup: remove some useless forward declarations cgroup: fix a typo in comment. --- b211e9d7c861bdb37b86d6384da9edfb80949ceb