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)
commitee7eafc907db64ef4cbe8a17da3a1089cbe50617
tree448cfbb1827083f875729135d4ab0d00b0f0752b
parent0df651a0740c9663093265277c32f0806e8ac23e
parentea84753c98a7ac6b74e530b64c444a912b3835ca
Merge branch 'for-3.12-fixes' of git://git./linux/kernel/git/tj/cgroup

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
kernel/cgroup.c