diff options
| author | Tejun Heo | 2014-02-11 17:02:59 +0100 |
|---|---|---|
| committer | Tejun Heo | 2014-02-11 17:02:59 +0100 |
| commit | 398f878789fceb51bf5e424b753a3756643513c4 (patch) | |
| tree | cd80a446bd1e2f1adc5652a805ac2f98a40b003e /kernel/events/core.c | |
| parent | Merge branch 'driver-core-next' into cgroup/for-3.15 (diff) | |
| parent | cgroup: protect modifications to cgroup_idr with cgroup_mutex (diff) | |
| download | kernel-qcow2-linux-398f878789fceb51bf5e424b753a3756643513c4.tar.gz kernel-qcow2-linux-398f878789fceb51bf5e424b753a3756643513c4.tar.xz kernel-qcow2-linux-398f878789fceb51bf5e424b753a3756643513c4.zip | |
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/core.c')
0 files changed, 0 insertions, 0 deletions