Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
commita9986464564609dd0962e6023513f7d3d313dc80
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 06:21:53 +0000 (13 15:21 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 06:21:53 +0000 (13 15:21 +0900)
treebcec3cd7404bdf3ac2e205a8cce5810b90ece6bf
parent13aa7e0bc20f7f7e5ef45f0defc4ff4380802302
parent73ba353471e0b692f398f3d63018b7f46ccf1d3e
Merge branch 'for-3.13' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup changes from Tejun Heo:
 "Not too much activity this time around.  css_id is finally killed and
  a minor update to device_cgroup"

* 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  device_cgroup: remove can_attach
  cgroup: kill css_id
  memcg: stop using css id
  memcg: fail to create cgroup if the cgroup id is too big
  memcg: convert to use cgroup id
  memcg: convert to use cgroup_is_descendant()
kernel/cgroup.c
mm/memcontrol.c