Merge tag 'efi-for-3.8' into x86/efi