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

Skip to content
Commit 0871d5a6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates



 Conflicts:
	arch/x86/xen/setup.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents e22af0be 2d6be4ab
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