tree 4f34bb4aade85c0eb364b53d664ec7f6ab959006
parent b9d2252c1e44fa83a4e65fdc9eb93db6297c55af
parent 42a2f217a5e324ed5f2373ab1b7a0a15187c4d6c
author Ingo Molnar <mingo@elte.hu> 1216151759 +0200
committer Ingo Molnar <mingo@elte.hu> 1216151759 +0200

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>