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)

Trivial merge