Tejun Heo edab95103d cgroup: Merge branch 'memcg_event' into for-3.14 ... Merge v3.12 based patch series to move cgroup_event implementation to memcg into for-3.14. The following two commits cause a conflict in kernel/cgroup.c 2ff2a7d03b ("cgroup: kill css_id") 79bd9814e5 ("cgroup, memcg: move cgroup_event implementation to memcg") Each patch removes a struct definition from kernel/cgroup.c. As the two are adjacent, they cause a context conflict. Easily resolved by removing both structs. Signed-off-by: Tejun Heo <tj@kernel.org>		2013-11-22 18:32:25 -05:00
..
00-INDEX	Documentation: cgroup: add documentation for net_cls cgroups.	2013-04-08 16:55:28 -04:00
blkio-controller.txt	blk-throttle: implement proper hierarchy support	2013-05-14 13:52:38 -07:00
cgroups.txt	memcg: rename cgroup_event to mem_cgroup_event	2013-11-22 18:20:44 -05:00
cpuacct.txt	Documentation: fix echo command in cgroups/cpuacct.txt	2011-07-23 10:58:08 -07:00
cpusets.txt	sched: Rename sched.c as sched/core.c in comments and Documentation	2013-06-19 12:58:42 +02:00
devices.txt	devcg: propagate local changes down the hierarchy	2013-03-20 07:50:21 -07:00
freezer-subsystem.txt	cgroup_freezer: implement proper hierarchy support	2012-11-09 10:52:30 -08:00
hugetlb.txt	hugetlb/cgroup: add HugeTLB controller documentation	2012-07-31 18:42:41 -07:00
memcg_test.txt	cgroups: move cgroup_event_listener.c to tools/cgroup	2013-01-07 09:41:28 -08:00
memory.txt	memcg: support hierarchical memory.numa_stats	2013-11-13 12:09:06 +09:00
net_cls.txt	Documentation: cgroup: add documentation for net_cls cgroups.	2013-04-08 16:55:28 -04:00
net_prio.txt	netprio_cgroup: allow nesting and inherit config on cgroup creation	2012-11-22 07:32:47 -08:00
resource_counter.txt	res_counter: return amount of charges after res_counter_uncharge()	2012-12-18 15:02:12 -08:00