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

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 9 Apr 2015 07:35:35 +0000 (17:35 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 9 Apr 2015 07:35:35 +0000 (17:35 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 07:35:35 +0000 (17:35 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 07:35:35 +0000 (17:35 +1000)
diff --cc include/linux/sched.h
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/sched/core.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 07:35:35 +0000 (17:35 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 07:35:35 +0000 (17:35 +1000)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history