Merge branch 'linus' into tracing/hw-branch-tracing

author Ingo Molnar <[email protected]>

Wed, 24 Dec 2008 20:08:26 +0000 (21:08 +0100)

committer Ingo Molnar <[email protected]>

Wed, 24 Dec 2008 20:08:26 +0000 (21:08 +0100)
author Ingo Molnar <[email protected]>
Wed, 24 Dec 2008 20:08:26 +0000 (21:08 +0100)
committer Ingo Molnar <[email protected]>
Wed, 24 Dec 2008 20:08:26 +0000 (21:08 +0100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/x86/Kconfig.cpu
Simple merge
author	Ingo Molnar <[email protected]>
	Wed, 24 Dec 2008 20:08:26 +0000 (21:08 +0100)
committer	Ingo Molnar <[email protected]>
	Wed, 24 Dec 2008 20:08:26 +0000 (21:08 +0100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.cpu	patch \|	diff1 \|	diff2 \|	blob \| history