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