From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:32:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'cgroup/for-next'
X-Git-Tag: next-20131025~51
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d4357337ce8991c910c349ad6703c1631c137c50;p=karo-tx-linux.git

Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
	mm/memcontrol.c
---

d4357337ce8991c910c349ad6703c1631c137c50
diff --cc mm/memcontrol.c
index 9c9c685e4ddc,65a46eff5c3d..f0d58afefacc
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -6170,9 -5979,6 +6183,8 @@@ static void __mem_cgroup_free(struct me
  	int node;
  	size_t size = memcg_size();
  
 +	mem_cgroup_remove_from_trees(memcg);
- 	free_css_id(&mem_cgroup_subsys, &memcg->css);
 +
  	for_each_node(node)
  		free_mem_cgroup_per_zone_info(memcg, node);