You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		17 years ago
..
boot	sparc64: remove CVS keywords	17 years ago
kernel	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
lib	sparc64: add ftrace support.	17 years ago
math-emu	sparc64: remove CVS keywords	17 years ago
mm	on_each_cpu(): kill unused 'retry' parameter	17 years ago
oprofile	Combine instrumentation menus in kernel/Kconfig.instrumentation	18 years ago
prom	sparc64: remove CVS keywords	17 years ago
Kconfig	ftrace: add have dynamic ftrace config for archs	17 years ago
Kconfig.debug	sparc64: add ftrace support.	17 years ago
Makefile	sparc64: remove CVS keywords	17 years ago
defconfig	sparc64: Update defconfig.	17 years ago