Merge commit 'v3.0' into x86/vdso
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)

Trivial merge