Merge tag 'efi-for-3.9-rc4' into x86/urgent

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>