]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Nov 2012 21:44:04 +0000 (13:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Nov 2012 21:44:04 +0000 (13:44 -0800)
Pull cgroup fixes from Tejun Heo:
 "This contains two fix patches for device_cgroup.  One fixes a
  regression introduced earlier in 3.7 cycle where device_cgroup could
  try to dereference the NULL parent of the root cgroup.  The other one
  is RCU usage fix."

* 'for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  device_cgroup: fix RCU usage
  device_cgroup: fix unchecked cgroup parent usage


Trivial merge