mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 05:02:12 +00:00
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> |
||
---|---|---|
.. | ||
drivers | ||
include | ||
kernel | ||
os-Linux | ||
scripts | ||
sys-i386 | ||
sys-ia64 | ||
sys-ppc | ||
sys-x86_64 | ||
defconfig | ||
Kconfig | ||
Kconfig.char | ||
Kconfig.debug | ||
Kconfig.i386 | ||
Kconfig.net | ||
Kconfig.x86_64 | ||
Makefile | ||
Makefile-i386 | ||
Makefile-ia64 | ||
Makefile-os-Linux | ||
Makefile-ppc | ||
Makefile-skas | ||
Makefile-x86_64 |