Skip to content
Commit 398f8787 authored by Tejun Heo's avatar Tejun Heo
Browse files

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



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

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents f7cef064 0ab02ca8
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment