diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-07-18 11:36:53 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-07-18 11:36:53 +0200 |
commit | 1ed7d32763857fbdc8e406352404538e41050d22 (patch) | |
tree | f97c5d8f548141bf7cdec0a9d7f22adb61da6efc /Documentation/x86 | |
parent | 660da7c9228f685b2ebe664f9fd69aaddcc420b5 (diff) | |
parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
download | linux-1ed7d32763857fbdc8e406352404538e41050d22.tar.bz2 |
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: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/x86')
0 files changed, 0 insertions, 0 deletions