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

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

Wed, 20 Feb 2013 02:48:55 +0000 (13:48 +1100)

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

Wed, 20 Feb 2013 02:48:55 +0000 (13:48 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:48:55 +0000 (13:48 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:48:55 +0000 (13:48 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched/core.c
Simple merge
diff --cc kernel/sched/debug.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 02:48:55 +0000 (13:48 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 02:48:55 +0000 (13:48 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/debug.c	patch \|	diff1 \|	diff2 \|	blob \| history