Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Dec 2013 17:49:20 +0000 (09:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Dec 2013 17:49:20 +0000 (09:49 -0800)
commit70e672fa7376d45e262119bda3e1a301e519d4c3
treea976bf244c4ee3c821a307e4c14fcedfe565ac77
parentf6398600f92b738813e34a1b576ac1cb895e43a1
parentc1a71504e9715812a2d15e7c03b5aa147ae70ded
Merge branch 'for-3.13-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup fixes from Tejun Heo:
 "Two fixes.  One fixes a bug in the error path of cgroup_create().  The
  other changes cgrp->id lifetime rule so that the id doesn't get
  recycled before all controller states are destroyed.  This premature
  id recycling made memcg malfunction"

* 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: don't recycle cgroup id until all csses' have been destroyed
  cgroup: fix cgroup_create() error handling path