Merge branch 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Oct 2013 07:20:34 +0000 (08:20 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Oct 2013 07:20:34 +0000 (08:20 +0100)
Pull cgroup fixes from Tejun Heo:
 "Two late fixes for cgroup.

  One fixes descendant walk introduced during this rc1 cycle.  The other
  fixes a post 3.9 bug during task attach which can lead to hang.  Both
  fixes are critical and the fixes are relatively straight-forward"

* 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: fix to break the while loop in cgroup_attach_task() correctly
  cgroup: fix cgroup post-order descendant walk of empty subtree

1  2 
kernel/cgroup.c

diff --cc kernel/cgroup.c
Simple merge