diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:30:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:30:11 +0100 |
| commit | 9a1f4150fe932fb892c05084029b3718b8ed1baf (patch) | |
| tree | b8f18ea5f0bdc842e3cf8da4700c1d577a3b1c66 /arch/x86/include/asm/e820 | |
| parent | x86/boot: Fix KASLR and memmap= collision (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.tar.xz linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.zip | |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/e820')
0 files changed, 0 insertions, 0 deletions