kevin/linux
1
Fork 0
Code
94a1e869c7
linux/arch/cris
History
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
..
arch-v10 Add a bunch of cycle_kernel_lock() calls 2008-06-20 14:05:53 -06:00
arch-v32 Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
kernel [PATCH] take init_files to fs/file.c 2008-05-16 17:22:20 -04:00
mm cris: remove redundant display of free swap space in show_mem() 2008-04-28 08:58:28 -07:00
artpec_3_defconfig CRIS: Remove CONFIG_NO_IOMEM from ARTPEC-3 default config. 2008-02-08 11:06:37 +01:00
defconfig CRIS: Remove CONFIG_NO_IOMEM from default configs. 2008-02-08 11:06:36 +01:00
etraxfs_defconfig CRIS: Remove CONFIG_NO_IOMEM from default configs. 2008-02-08 11:06:36 +01:00
Kconfig ide: introduce HAVE_IDE 2008-02-09 10:46:40 +01:00
Kconfig.debug
Makefile CRIS: Update main Kbuild makefile. 2008-02-08 11:06:25 +01:00