Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Oct 2014 11:24:40 +0000 (07:24 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Oct 2014 11:24:40 +0000 (07:24 -0400)
commitb211e9d7c861bdb37b86d6384da9edfb80949ceb
treedfb209ffce92a2b203a9fd2ddbc23eed5daddacf
parentd9428f09763d307a6d2220c4bbb01d8fc5c55b52
parente756c7b698604f11a979f2781d06eb7b80aba363
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.
fs/proc/base.c
include/linux/cpuset.h
kernel/cgroup.c
kernel/cpuset.c
kernel/events/core.c