Merge commit 'v2.6.34-rc6' into x86/cpu
authorH. Peter Anvin <hpa@zytor.com>
Sat, 8 May 2010 21:59:58 +0000 (14:59 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 8 May 2010 21:59:58 +0000 (14:59 -0700)

Trivial merge