Ingo Molnar 1a781a777b Merge branch 'generic-ipi' into generic-ipi-for-linus ... Conflicts: arch/powerpc/Kconfig arch/s390/kernel/time.c arch/x86/kernel/apic_32.c arch/x86/kernel/cpu/perfctr-watchdog.c arch/x86/kernel/i8259_64.c arch/x86/kernel/ldt.c arch/x86/kernel/nmi_64.c arch/x86/kernel/smpboot.c arch/x86/xen/smp.c include/asm-x86/hw_irq_32.h include/asm-x86/hw_irq_64.h include/asm-x86/mach-default/irq_vectors.h include/asm-x86/mach-voyager/irq_vectors.h include/asm-x86/smp.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-15 21:55:59 +02:00
..
entry_arch.h	x86, visws: use mach-default/entry_arch.h	2008-07-10 12:35:50 +02:00
mach_apic.h	x86, VisWS: turn into generic arch, eliminate include/asm-x86/mach-visws/mach_apic.h	2008-07-10 18:55:34 +02:00
mach_apicdef.h	x86, VisWS: turn into generic arch, eliminate asm-x86/mach-visws/mach_apicdef.h	2008-07-10 18:55:38 +02:00
setup_arch.h	x86, VisWS: turn into generic arch, eliminate include/asm-x86/mach-visws/setup_arch.h	2008-07-10 18:55:40 +02:00
smpboot_hooks.h	x86, VisWS: turn into generic arch, eliminate include/asm-x86/mach-visws/smpboot_hooks.h	2008-07-10 18:55:36 +02:00