diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-26 19:47:03 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-26 19:47:03 (GMT) |
| commit | 1e1b37273cf719545da50b76f214f983a710aaf4 (patch) | |
| tree | 033f6062325ef7aaeefe8559bb409ab7d2be3c76 /arch/x86/mm/kasan_init_64.c | |
| parent | c183a603e8d8a5a189729b77d0c623a3d5950e5f (diff) | |
| parent | c291b015158577be533dd5a959dfc09bab119eed (diff) | |
| download | linux-1e1b37273cf719545da50b76f214f983a710aaf4.tar.xz | |
Merge branch 'x86/urgent' into x86/apic
Bring in the upstream modifications so we can fixup the silent merge
conflict which is introduced by this merge.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm/kasan_init_64.c')
0 files changed, 0 insertions, 0 deletions