Merge branch 'sched/urgent' into sched/core

author Ingo Molnar <mingo@elte.hu>

Fri, 7 Nov 2008 09:29:58 +0000 (10:29 +0100)

committer Ingo Molnar <mingo@elte.hu>

Fri, 7 Nov 2008 09:29:58 +0000 (10:29 +0100)
author Ingo Molnar <mingo@elte.hu>
Fri, 7 Nov 2008 09:29:58 +0000 (10:29 +0100)
committer Ingo Molnar <mingo@elte.hu>
Fri, 7 Nov 2008 09:29:58 +0000 (10:29 +0100)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 7 Nov 2008 09:29:58 +0000 (10:29 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 7 Nov 2008 09:29:58 +0000 (10:29 +0100)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history