diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 21:07:00 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 21:07:00 +0400 |
| commit | 4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125 (patch) | |
| tree | 888b52771f540552a9dc85521d8dddf66eba9aeb /arch/ia64/include/asm/meminit.h | |
| parent | 9b3965f7401b0cc3ed2c228085a4c13b1c9243b1 (diff) | |
| parent | f4bcd8ccddb02833340652e9f46f5127828eb79d (diff) | |
| download | linux-4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125.tar.xz | |
Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build
Bring in upstream merge of x86/kaslr for future patches.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/ia64/include/asm/meminit.h')
| -rw-r--r-- | arch/ia64/include/asm/meminit.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/meminit.h b/arch/ia64/include/asm/meminit.h index 61c7b1750b16..092f1c91b36c 100644 --- a/arch/ia64/include/asm/meminit.h +++ b/arch/ia64/include/asm/meminit.h @@ -18,7 +18,6 @@ * - crash dumping code reserved region * - Kernel memory map built from EFI memory map * - ELF core header - * - xen start info if CONFIG_XEN * * More could be added if necessary */ |