Skip to content
Commit 4fd69331 authored by Matt Fleming's avatar Matt Fleming
Browse files

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

Conflicts:
	arch/x86/include/asm/efi.h
parents 69e60841 0ac09f9f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment