Merge branch 'sched/rt' into sched/core

author Ingo Molnar <mingo@elte.hu>

Mon, 24 Nov 2008 16:37:12 +0000 (17:37 +0100)

committer Ingo Molnar <mingo@elte.hu>

Mon, 24 Nov 2008 16:37:12 +0000 (17:37 +0100)
author Ingo Molnar <mingo@elte.hu>
Mon, 24 Nov 2008 16:37:12 +0000 (17:37 +0100)
committer Ingo Molnar <mingo@elte.hu>
Mon, 24 Nov 2008 16:37:12 +0000 (17:37 +0100)
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 24 Nov 2008 16:37:12 +0000 (17:37 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 24 Nov 2008 16:37:12 +0000 (17:37 +0100)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history