Merge remote branch 'origin/x86/cpu' into x86/amd-nb

author H. Peter Anvin <hpa@linux.intel.com>

Fri, 1 Oct 2010 23:18:11 +0000 (16:18 -0700)

committer H. Peter Anvin <hpa@linux.intel.com>

Fri, 1 Oct 2010 23:18:11 +0000 (16:18 -0700)
author H. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Oct 2010 23:18:11 +0000 (16:18 -0700)
committer H. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Oct 2010 23:18:11 +0000 (16:18 -0700)
diff --cc arch/x86/include/asm/cpufeature.h
Simple merge
diff --cc arch/x86/kernel/tsc.c
Simple merge
author	H. Peter Anvin <hpa@linux.intel.com>
	Fri, 1 Oct 2010 23:18:11 +0000 (16:18 -0700)
committer	H. Peter Anvin <hpa@linux.intel.com>
	Fri, 1 Oct 2010 23:18:11 +0000 (16:18 -0700)
		1	2
arch/x86/include/asm/cpufeature.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tsc.c	patch \|	diff1 \|	diff2 \|	blob \| history