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)
commiteca217b36e5d7d4377493d5cedd89105e66a5a72
tree71f0ecd5225c3033d509b77a23ad7bc576cf0ab6
parent54a353a0f845c1dad5fc8183872e750d667838ac
parente4d0407185cdbdcfd99fc23bde2e5454bbc46329
Merge branch 'x86/paravirt' into x86/apic

Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/include/asm/paravirt.h
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/smpboot.c
arch/x86/kernel/tlb_uv.c
arch/x86/mach-voyager/voyager_smp.c