linux/arch/cris/arch-v32
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 CRIS v32: Update boot/rescue/rescue.ld 2008-02-08 11:06:35 +01:00
drivers Add a bunch of cycle_kernel_lock() calls 2008-06-20 14:05:53 -06:00
kernel smp_call_function: get rid of the unused nonatomic/retry argument 2008-06-26 11:24:35 +02:00
lib cris: correct usage of __user for copy to and from user space in lib/usercopy and uaccess.h 2008-03-04 16:35:16 -08:00
mach-a3 CRIS v32: Correct spelling of bandwidth in function name. 2008-02-08 11:16:46 +01:00
mach-fs CRIS v32: Update vcs_hook.c for ETRAX FS. 2008-02-08 11:06:35 +01:00
mm CRIS v32: Avoid work when switching between tasks with shared memory descriptors in mm/tlb.c 2008-02-08 11:06:36 +01:00
Kconfig CRIS: Rearrange Kconfigs for v10 and v32 to allow compilation without warnings. 2008-02-08 11:06:22 +01:00
output_arch.ld
vmlinux.lds.S CRIS v32: Fix startup oops and replace hardcoded pagesize in vmlinux.lds.S 2008-02-08 11:06:36 +01:00