Merge remote-tracking branch 'linus/master' into x86/urgent
H. Peter Anvin [Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)]
1  2 
arch/x86/Kconfig
arch/x86/kernel/tsc.c

Simple merge
Simple merge