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:  Ingo Molnar <mingo@kernel.org>
Ingo Molnar <mingo@kernel.org>
Loading
Please register or sign in to comment
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
 Conflicts:
	arch/x86/xen/setup.c
Signed-off-by:  Ingo Molnar <mingo@kernel.org>
Ingo Molnar <mingo@kernel.org>