Merge branch 'cgroup/for-3.7-fixes' into cgroup/for-3.8
authorTejun Heo <tj@kernel.org>
Tue, 6 Nov 2012 20:26:23 +0000 (12:26 -0800)
committerTejun Heo <tj@kernel.org>
Tue, 6 Nov 2012 20:26:23 +0000 (12:26 -0800)
commit5b805f2a7675634fbdf9ac1c9b2256905ab2ea68
treeee00d1e3d757458d66209b926d274491c6c3f61c
parent1db1e31b1ee3ae126ef98f39083b5f213c7b41bf
parent201e72acb2d3821e2de9ce6091e98859c316b29a
Merge branch 'cgroup/for-3.7-fixes' into cgroup/for-3.8

This is to receive device_cgroup fixes so that further device_cgroup
changes can be made in cgroup/for-3.8.

Signed-off-by: Tejun Heo <tj@kernel.org>
block/blk-cgroup.c
kernel/cgroup.c