Merge remote-tracking branch 'linus/master' into x86/urgent
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)
commit282f445a779ed76fca9884fe377bf56a3088b208
treed9abcf526baee0100672851e0a8894c19e762a39
parent68f30fbee19cc67849b9fa8e153ede70758afe81
parent90a4c0f51e8e44111a926be6f4c87af3938a79c3
Merge remote-tracking branch 'linus/master' into x86/urgent
arch/x86/Kconfig
arch/x86/kernel/tsc.c