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

Merge branch 'x86/urgent' into x86/platform, to resolve conflict 



Conflicts:
	arch/x86/kernel/apic/x2apic_uv_x.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f68376fc 08914f43
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