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

diff --cc kernel/cgroup.c
Simple merge

diff --cc mm/memcontrol.c
index 13b9d0f221b8460ae3c361dd51d22ae969e78325,65a46eff5c3dd3932deb8c70595d64b1ea388089..796820925de0b758c5eea87a4e3484de07e0e56f
--- 1/mm/memcontrol.c
--- 2/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -6165,9 -5979,6 +6178,8 @@@ static void __mem_cgroup_free(struct me
        int node;
        size_t size = memcg_size();
  
-       free_css_id(&mem_cgroup_subsys, &memcg->css);
 +      mem_cgroup_remove_from_trees(memcg);
 +
        for_each_node(node)
                free_mem_cgroup_per_zone_info(memcg, node);