Merge branch 'for-4.5-ancestor-test' of git://git.kernel.org/pub/scm/linux/kernel...

author Tejun Heo <tj@kernel.org>

Mon, 7 Dec 2015 22:24:10 +0000 (17:24 -0500)

committer Tejun Heo <tj@kernel.org>

Mon, 7 Dec 2015 22:24:10 +0000 (17:24 -0500)
author Tejun Heo <tj@kernel.org>
Mon, 7 Dec 2015 22:24:10 +0000 (17:24 -0500)
committer Tejun Heo <tj@kernel.org>
Mon, 7 Dec 2015 22:24:10 +0000 (17:24 -0500)
diff --cc include/linux/cgroup-defs.h
Simple merge
diff --cc include/linux/cgroup.h
Simple merge
diff --cc kernel/cgroup.c
Simple merge
author	Tejun Heo <tj@kernel.org>
	Mon, 7 Dec 2015 22:24:10 +0000 (17:24 -0500)
committer	Tejun Heo <tj@kernel.org>
	Mon, 7 Dec 2015 22:24:10 +0000 (17:24 -0500)
		1	2
include/linux/cgroup-defs.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/cgroup.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	patch \|	diff1 \|	diff2 \|	blob \| history