aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-11-05 12:21:51 -0500
committerTejun Heo <tj@kernel.org>2012-11-05 12:21:51 -0500
commit1db1e31b1ee3ae126ef98f39083b5f213c7b41bf (patch)
tree98328124d3b8b08b6db894c79d0e79b3a42417bf /arch/arm/mach-s5pv210
parent5d8f72b55c275677865de670fa147ed318191d81 (diff)
parentbcf6de1b9129531215d26dd9af8331e84973bc52 (diff)
Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8
Pull rmdir updates into for-3.8 so that further callback updates can be put on top. This pull created a trivial conflict between the following two commits. 8c7f6edbda ("cgroup: mark subsystems with broken hierarchy support and whine if cgroups are nested for them") ed95779340 ("cgroup: kill cgroup_subsys->__DEPRECATED_clear_css_refs") The former added a field to cgroup_subsys and the latter removed one from it. They happen to be colocated causing the conflict. Keeping what's added and removing what's removed resolves the conflict. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/arm/mach-s5pv210')
0 files changed, 0 insertions, 0 deletions