Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/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()

diff --cc block/blk-cgroup.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/core/netprio_cgroup.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/tcp_memcontrol.c
Simple merge