From: Tejun Heo <tj@kernel.org>
Date: Mon, 5 Nov 2012 17:21:51 +0000 (-0800)
Subject: Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~57^2~47
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1db1e31b1ee3ae126ef98f39083b5f213c7b41bf;p=pandora-kernel.git

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>
---

1db1e31b1ee3ae126ef98f39083b5f213c7b41bf
Reading git-diff-tree failed