Skip to content
Commit 9553e113 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/uv' into x86/x2apic 



Conflicts:

	arch/x86/kernel/Makefile

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 453c1404 7019cc2d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment