git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a208f37 35b6805)
Merge branch 'x86/apic' into x86/x2apic
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 21:00:05 +0000 (23:00 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 21:00:05 +0000 (23:00 +0200)
Conflicts:

arch/x86/kernel/paravirt.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmi_32.c
arch/x86/lguest/boot.c
arch/x86/xen/enlighten.c
include/asm-x86/apic.h
include/asm-x86/paravirt.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge
Pandora Kernel Repository