projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c2189e3 f3ba538)
Merge branch 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Feb 2015 03:07:45 +0000 (19:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Feb 2015 03:07:45 +0000 (19:07 -0800)
commit15763db134dd60504dbd93137e6654f06d639acf
tree029202adc2faf44a84f5c9454fe0073094b06d0dtree | snapshot
parentc2189e3a3d67e94941c568ee8fab1b86983cd024commit | diff
parentf3ba53802eff25e3eedb60d7afe5262710e20bd5commit | diff
Merge branch 'for-3.20' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup changes from Tejun Heo:
 "Three mostly trivial patches.  The biggest change is that blkio is now
  initialized before memcg which will be needed to make memcg and blkcg
  cooperate on writeback IOs"

* 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: add dummy css_put() for !CONFIG_CGROUPS
  cgroup: reorder SUBSYS(blkio) in cgroup_subsys.h
  Update of Documentation/cgroups/00-INDEX
ep93xx device tree rework repo: git://git.maquefel.me/linux.git