diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-11 11:02:59 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-11 11:02:59 -0500 |
| commit | 398f878789fceb51bf5e424b753a3756643513c4 (patch) | |
| tree | cd80a446bd1e2f1adc5652a805ac2f98a40b003e /kernel/events | |
| parent | f7cef064aa01a1ac682c1945cc168b878cb118ff (diff) | |
| parent | 0ab02ca8f887908152d1a96db5130fc661d36a1e (diff) | |
| download | op-kernel-dev-398f878789fceb51bf5e424b753a3756643513c4.zip op-kernel-dev-398f878789fceb51bf5e424b753a3756643513c4.tar.gz | |
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>
Diffstat (limited to 'kernel/events')
0 files changed, 0 insertions, 0 deletions
