Merge remote branch 'linus/master' into x86/cpu
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 28 Jul 2010 20:11:28 +0000 (13:11 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 28 Jul 2010 20:11:28 +0000 (13:11 -0700)

Trivial merge