Merge branch 'x86/efi'