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
..
Makefile	i386: move oprofile	2007-10-11 11:16:55 +02:00
backtrace.c	x86: rename stack_pointer to kernel_trap_sp	2008-01-30 13:33:16 +01:00
init.c	x86: coding style fixes to arch/x86/oprofile/init.c	2008-04-17 17:40:49 +02:00
nmi_int.c	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
nmi_timer_int.c	x86: coding style fixes to arch/x86/oprofile/nmi_timer_int.c	2008-04-17 17:40:50 +02:00
op_counter.h	i386: move oprofile	2007-10-11 11:16:55 +02:00
op_model_athlon.c	x86: coding style fixes to arch/x86/oprofile/op_model_athlon.c	2008-04-17 17:40:48 +02:00
op_model_p4.c	Convert cpu_sibling_map to be a per cpu variable	2007-10-16 09:42:50 -07:00
op_model_ppro.c	x86: coding style fixes to arch/x86/oprofile/op_model_ppro.c	2008-04-17 17:40:48 +02:00
op_x86_model.h	spelling fixes: arch/i386/	2007-10-20 01:13:56 +02:00