1a781a777b
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> |
||
---|---|---|
.. | ||
apm.h | ||
do_timer.h | ||
entry_arch.h | ||
mach_apic.h | ||
mach_apicdef.h | ||
mach_ipi.h | ||
mach_mpparse.h | ||
mach_mpspec.h | ||
mach_timer.h | ||
mach_traps.h | ||
mach_wakecpu.h | ||
pci-functions.h | ||
setup_arch.h | ||
smpboot_hooks.h |