Merge branch 'linus' into sched/core

author Ingo Molnar <mingo@elte.hu>

Wed, 19 Nov 2008 08:44:37 +0000 (09:44 +0100)

committer Ingo Molnar <mingo@elte.hu>

Wed, 19 Nov 2008 08:44:37 +0000 (09:44 +0100)
author Ingo Molnar <mingo@elte.hu>
Wed, 19 Nov 2008 08:44:37 +0000 (09:44 +0100)
committer Ingo Molnar <mingo@elte.hu>
Wed, 19 Nov 2008 08:44:37 +0000 (09:44 +0100)
diff --cc arch/ia64/Kconfig
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/sched_debug.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 19 Nov 2008 08:44:37 +0000 (09:44 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 19 Nov 2008 08:44:37 +0000 (09:44 +0100)
		1	2
arch/ia64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched_debug.c	patch \|	diff1 \|	diff2 \|	blob \| history