tree 07a09b5e19a4d55c4a097b280eb64bd159ca0eb9
parent b678c91aefa7ce05a5d195e0a5c7a357b62d3283
parent 4729277156cf18acd9b9b04d6ef8c2a8a7bf00dc
author Ingo Molnar <mingo@kernel.org> 1491893765 +0200
committer Ingo Molnar <mingo@kernel.org> 1491893765 +0200

Merge branch 'x86/boot' into x86/mm, to avoid conflict

There's a conflict between ongoing level-5 paging support and
the E820 rewrite. Since the E820 rewrite is essentially ready,
merge it into x86/mm to reduce tree conflicts.

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