Merge commit 'v3.4' into x86/urgent
authorH. Peter Anvin <hpa@zytor.com>
Mon, 21 May 2012 19:17:50 +0000 (12:17 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 21 May 2012 19:17:50 +0000 (12:17 -0700)

Trivial merge