Merge branch 'x86/paravirt' into x86/apic

Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
This commit is contained in:
Ingo Molnar 2009-02-09 12:16:59 +01:00
commit eca217b36e
27 changed files with 1399 additions and 1167 deletions