From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Feb 2015 03:07:45 +0000 (-0800)
Subject: Merge branch 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~8793
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=15763db134dd60504dbd93137e6654f06d639acf;p=mirror_ubuntu-artful-kernel.git

Merge branch 'for-3.20' of git://git.kernel.org/pub/scm/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
---

15763db134dd60504dbd93137e6654f06d639acf