From: Tejun Heo <tj@kernel.org>
Date: Tue, 11 Feb 2014 16:02:59 +0000 (-0500)
Subject: Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15
X-Git-Tag: firefly_0821_release~176^2~4163^2~69
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=398f878789fceb51bf5e424b753a3756643513c4;p=firefly-linux-kernel-4.4.55.git

Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15

Pull for-3.14-fixes to receive 0ab02ca8f887 ("cgroup: protect
modifications to cgroup_idr with cgroup_mutex") prior to kernfs
conversion series to avoid non-trivial conflicts.

Signed-off-by: Tejun Heo <tj@kernel.org>
---

398f878789fceb51bf5e424b753a3756643513c4