Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo

Conflicts:
	arch/x86/include/asm/efi.h