Skip to content
Snippets Groups Projects
Commit 1ed7d327 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/boot' into x86/mm, to pick up interacting changes


The SME patches we are about to apply add some E820 logic, so merge in
pending E820 code changes first, to have a single code base.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 660da7c9 27aac205
No related branches found
No related tags found
Loading
Showing
with 517 additions and 46 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment