]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'x86/boot' into x86/mm, to unify branches
authorIngo Molnar <mingo@kernel.org>
Mon, 26 Feb 2018 07:45:20 +0000 (08:45 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 26 Feb 2018 07:48:08 +0000 (08:48 +0100)
Both x86/mm and x86/boot contain 5-level paging related patches,
unify them to have a single tree to work against.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge