Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit ee073662 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/urgent' into x86/setup



Resolved conflicts:
	arch/x86/boot/memory.c

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parents cf9972a9 0af48f42
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment