Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Mar 2012 01:11:21 +0000 (18:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Mar 2012 01:11:21 +0000 (18:11 -0700)
commit0d9cabdccedb79ee5f27b77ff51f29a9e7d23275
tree8bfb64c3672d058eb90aec3c3a9c4f61cef9097c
parent701085b219016d38f105b031381b9cee6200253a
parent3ce3230a0cff484e5130153f244d4fb8a56b3a8b
Merge branch 'for-3.4' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup changes from Tejun Heo:
 "Out of the 8 commits, one fixes a long-standing locking issue around
  tasklist walking and others are cleanups."

* 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list
  cgroup: Remove wrong comment on cgroup_enable_task_cg_list()
  cgroup: remove cgroup_subsys argument from callbacks
  cgroup: remove extra calls to find_existing_css_set
  cgroup: replace tasklist_lock with rcu_read_lock
  cgroup: simplify double-check locking in cgroup_attach_proc
  cgroup: move struct cgroup_pidlist out from the header file
  cgroup: remove cgroup_attach_task_current_cg()
block/blk-cgroup.c
include/net/sock.h
kernel/events/core.c
kernel/sched/core.c
mm/memcontrol.c
net/core/netprio_cgroup.c
net/core/sock.c
net/ipv4/tcp_memcontrol.c