commit | 1e096209da0c2c8ca8462842a7a2e5928d3e82c3 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 14 13:44:04 2012 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 14 13:44:04 2012 -0800 |
tree | 293a5d572ca32b16cba8cd236dbe26a1d7bb388e | |
parent | 9924a1992a86ebdb7ca36ef790d2ba0da506296c [diff] | |
parent | 201e72acb2d3821e2de9ce6091e98859c316b29a [diff] |
Merge branch 'for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 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