Merge branch 'x86/urgent' into x86/setup
Resolved conflicts:
arch/x86/boot/memory.c
Signed-off-by:
H. Peter Anvin <hpa@zytor.com>
Loading
Please sign in to comment
Resolved conflicts:
arch/x86/boot/memory.c
Signed-off-by:
H. Peter Anvin <hpa@zytor.com>