Merge branch 'linus' into tracing/hw-branch-tracing
Ingo Molnar [Wed, 24 Dec 2008 20:08:26 +0000 (21:08 +0100)]
1  2 
Documentation/kernel-parameters.txt
arch/x86/Kconfig.cpu

Simple merge
Simple merge