From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 15 Jul 2008 19:55:59 +0000 (+0200)
Subject: Merge branch 'generic-ipi' into generic-ipi-for-linus
X-Git-Tag: v2.6.27-rc1~1069^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a781a777b2f6ac46523fe92396215762ced624d;p=pandora-kernel.git

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>
---

1a781a777b2f6ac46523fe92396215762ced624d
Reading git-diff-tree failed