]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f0c1468 6f16e38)
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)
commit52ba78b70a23539820accdcd6953056516ff774e
treecd80a446bd1e2f1adc5652a805ac2f98a40b003etree | snapshot
parentf0c14684f8fce9555319e57116e5b07765b3a9afcommit | diff
parent6f16e38e3709d6846cb1eb925c466f513acc8200commit | diff
Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15

Pull for-3.14-fixes to receive 6f16e38e3709 ("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 Source Tree.