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
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
cpusets.txt	sched: Rename sched.c as sched/core.c in comments and Documentation	2013-06-19 12:58:42 +02:00
devices.txt
freezer-subsystem.txt
hugetlb.txt
memcg_test.txt
memory.txt	memcg: support hierarchical memory.numa_stats	2013-11-13 12:09:06 +09:00
net_cls.txt
net_prio.txt
resource_counter.txt