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

Merge branch 'x86/x2apic' into x86/core 



Conflicts:
	arch/x86/kernel/cpu/common_64.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 446d2733 aa3341a1
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