arch/x86/kernel/apic/x2apic_phys.c · b18d62891aaff49d0ee8367d4b6bb9452469f807 · nexedi / linux · GitLab

Find file Blame History Permalink

Merge branch 'linus' into x86/apic, to resolve conflicts · 141d3b1d
Ingo Molnar authored Nov 07, 2017
```
Conflicts:
	arch/x86/include/asm/x2apic.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
```
141d3b1d

x2apic_phys.c 4.25 KB