Merge branch 'sched/core'

author Ingo Molnar <mingo@elte.hu>

Fri, 2 Mar 2012 11:24:00 +0000 (12:24 +0100)

committer Ingo Molnar <mingo@elte.hu>

Fri, 2 Mar 2012 11:24:00 +0000 (12:24 +0100)
author Ingo Molnar <mingo@elte.hu>
Fri, 2 Mar 2012 11:24:00 +0000 (12:24 +0100)
committer Ingo Molnar <mingo@elte.hu>
Fri, 2 Mar 2012 11:24:00 +0000 (12:24 +0100)
diff --cc fs/proc/base.c
Simple merge
diff --cc include/linux/sched.h
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 2 Mar 2012 11:24:00 +0000 (12:24 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 2 Mar 2012 11:24:00 +0000 (12:24 +0100)
		1	2
fs/proc/base.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history