Merge commit 'v3.0' into x86/cpu
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 5 Aug 2011 19:25:56 +0000 (12:25 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 5 Aug 2011 19:25:56 +0000 (12:25 -0700)

Trivial merge