Skip to content
Commit 994448f1 authored by Matt Fleming's avatar Matt Fleming
Browse files

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

Conflicts:
	arch/x86/kernel/setup.c
	arch/x86/platform/efi/efi.c
	arch/x86/platform/efi/efi_64.c
parents 4fd69331 18c46461
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment