forked from Minki/linux
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> |
||
---|---|---|
.. | ||
arch-v10 | ||
arch-v32 | ||
kernel | ||
mm | ||
artpec_3_defconfig | ||
defconfig | ||
etraxfs_defconfig | ||
Kconfig | ||
Kconfig.debug | ||
Makefile |