Merge commit 'efi-for-3.7-v2' into x86/urgent
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 21 Nov 2012 00:49:15 +0000 (16:49 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 21 Nov 2012 00:49:15 +0000 (16:49 -0800)

Trivial merge