Merge remote branch 'origin/x86/cpu' into x86/amd-nb
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Oct 2010 23:18:11 +0000 (16:18 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Oct 2010 23:18:11 +0000 (16:18 -0700)
commit86ffb08519d6fe1e9c4fe5a110ffa5fcb868cb1c
treede2fe9f6c122dc34c825e60619560452132f0cf2
parent23ac4ae827e6264e21b898f2cd3f601450aa02a6
parentaeb9c7d618264dcf6eea39142fefee096c3b09e2
Merge remote branch 'origin/x86/cpu' into x86/amd-nb
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/tsc.c