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

Merge branch 'x86/urgent' into x86/core 

Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
parents a852cbfa 55d80856
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