Merge branch 'for-4.3-unified-base' into for-4.3

author Tejun Heo <tj@kernel.org>

Tue, 25 Aug 2015 18:19:29 +0000 (14:19 -0400)

committer Tejun Heo <tj@kernel.org>

Tue, 25 Aug 2015 18:19:29 +0000 (14:19 -0400)
author Tejun Heo <tj@kernel.org>
Tue, 25 Aug 2015 18:19:29 +0000 (14:19 -0400)
committer Tejun Heo <tj@kernel.org>
Tue, 25 Aug 2015 18:19:29 +0000 (14:19 -0400)
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>
	Tue, 25 Aug 2015 18:19:29 +0000 (14:19 -0400)
committer	Tejun Heo <tj@kernel.org>
	Tue, 25 Aug 2015 18:19:29 +0000 (14:19 -0400)
		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