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

Merge branch 'x86/paravirt' into x86/apic 

Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
parents 54a353a0 e4d04071
Expand all 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