]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f7cef06 0ab02ca)
Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15
authorTejun Heo <tj@kernel.org>
Tue, 11 Feb 2014 16:02:59 +0000 (11:02 -0500)
committerTejun Heo <tj@kernel.org>
Tue, 11 Feb 2014 16:02:59 +0000 (11:02 -0500)
commit398f878789fceb51bf5e424b753a3756643513c4
treecd80a446bd1e2f1adc5652a805ac2f98a40b003etree | snapshot
parentf7cef064aa01a1ac682c1945cc168b878cb118ffcommit | diff
parent0ab02ca8f887908152d1a96db5130fc661d36a1ecommit | diff
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>
include/linux/cgroup.h diff1 | diff2 | blob | history
kernel/cgroup.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules