From: Tejun Heo 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=398f878789fceb51bf5e424b753a3756643513c4;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.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 --- 398f878789fceb51bf5e424b753a3756643513c4