Merge branch 'x86/paravirt' into x86/apic
authorIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 11:16:59 +0000 (12:16 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 11:16:59 +0000 (12:16 +0100)
Conflicts:
arch/x86/mach-voyager/voyager_smp.c


Trivial merge