Merge branch 'linus' into tracing/ftrace

author Ingo Molnar <[email protected]>

Wed, 25 Jun 2008 10:27:56 +0000 (12:27 +0200)

committer Ingo Molnar <[email protected]>

Wed, 25 Jun 2008 10:27:56 +0000 (12:27 +0200)
author Ingo Molnar <[email protected]>
Wed, 25 Jun 2008 10:27:56 +0000 (12:27 +0200)
committer Ingo Molnar <[email protected]>
Wed, 25 Jun 2008 10:27:56 +0000 (12:27 +0200)
diff --cc Makefile
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/kernel/Makefile
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Ingo Molnar <[email protected]>
	Wed, 25 Jun 2008 10:27:56 +0000 (12:27 +0200)
committer	Ingo Molnar <[email protected]>
	Wed, 25 Jun 2008 10:27:56 +0000 (12:27 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history