android_kernel_xiaomi_sm8350/arch/x86/mach-voyager
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
setup.c x86: cleanup machine_specific_memory_setup, v2 2008-07-08 10:39:01 +02:00
voyager_basic.c x86: remove pointless comments 2008-04-19 19:19:54 +02:00
voyager_cat.c x86, voyager: fix ioremap_nocache() 2008-04-30 23:15:34 +02:00
voyager_smp.c Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
voyager_thread.c x86: remove pointless comments 2008-04-19 19:19:54 +02:00