tmp_suning_uos_patched/arch/sparc64
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
..
boot sparc64: remove CVS keywords 2008-05-20 00:33:43 -07:00
kernel Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
lib sparc64: add ftrace support. 2008-05-23 22:36:13 +02:00
math-emu sparc64: remove CVS keywords 2008-05-20 00:33:43 -07:00
mm on_each_cpu(): kill unused 'retry' parameter 2008-06-26 11:24:38 +02:00
oprofile Combine instrumentation menus in kernel/Kconfig.instrumentation 2007-10-19 11:53:54 -07:00
prom sparc64: remove CVS keywords 2008-05-20 00:33:43 -07:00
defconfig sparc64: Update defconfig. 2008-05-16 13:36:27 -07:00
Kconfig ftrace: add have dynamic ftrace config for archs 2008-05-23 22:49:18 +02:00
Kconfig.debug sparc64: add ftrace support. 2008-05-23 22:36:13 +02:00
Makefile sparc64: remove CVS keywords 2008-05-20 00:33:43 -07:00