arch/x86/kernel/apic/x2apic_uv_x.c · bc231d9ede99518b67a77544d9084f15b898fe2e · Kirill Smelkov / linux · GitLab

Find file Blame History Permalink

Merge branch 'x86/urgent' into x86/platform, to resolve conflict · 3cd0b535
Ingo Molnar authored May 05, 2016
```
Conflicts:
	arch/x86/kernel/apic/x2apic_uv_x.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
```
3cd0b535

x2apic_uv_x.c 39.9 KB