git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f7cef06
0ab02ca
)
Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15
author
Tejun Heo
<tj@kernel.org>
Tue, 11 Feb 2014 16:02:59 +0000
(11:02 -0500)
committer
Tejun Heo
<tj@kernel.org>
Tue, 11 Feb 2014 16:02:59 +0000
(11:02 -0500)
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>
Trivial merge