Merge remote branch 'origin/x86/apic' into x86/mrst
Conflicts: arch/x86/kernel/apic/io_apic.c
Showing
- Documentation/kernel-parameters.txt 6 additions, 0 deletionsDocumentation/kernel-parameters.txt
- arch/ia64/include/asm/xen/events.h 0 additions, 4 deletionsarch/ia64/include/asm/xen/events.h
- arch/ia64/kernel/acpi.c 2 additions, 2 deletionsarch/ia64/kernel/acpi.c
- arch/x86/ia32/ia32_aout.c 0 additions, 1 deletionarch/x86/ia32/ia32_aout.c
- arch/x86/include/asm/i8259.h 1 addition, 1 deletionarch/x86/include/asm/i8259.h
- arch/x86/include/asm/io_apic.h 1 addition, 0 deletionsarch/x86/include/asm/io_apic.h
- arch/x86/include/asm/irq.h 1 addition, 0 deletionsarch/x86/include/asm/irq.h
- arch/x86/include/asm/irq_vectors.h 23 additions, 25 deletionsarch/x86/include/asm/irq_vectors.h
- arch/x86/kernel/acpi/boot.c 8 additions, 1 deletionarch/x86/kernel/acpi/boot.c
- arch/x86/kernel/apic/io_apic.c 134 additions, 95 deletionsarch/x86/kernel/apic/io_apic.c
- arch/x86/kernel/apic/nmi.c 3 additions, 3 deletionsarch/x86/kernel/apic/nmi.c
- arch/x86/kernel/i8259.c 15 additions, 15 deletionsarch/x86/kernel/i8259.c
- arch/x86/kernel/irqinit.c 17 additions, 18 deletionsarch/x86/kernel/irqinit.c
- arch/x86/kernel/reboot.c 8 additions, 0 deletionsarch/x86/kernel/reboot.c
- arch/x86/kernel/smpboot.c 9 additions, 4 deletionsarch/x86/kernel/smpboot.c
- arch/x86/kernel/time.c 2 additions, 2 deletionsarch/x86/kernel/time.c
- arch/x86/kernel/visws_quirks.c 3 additions, 3 deletionsarch/x86/kernel/visws_quirks.c
- arch/x86/kernel/vmiclock_32.c 1 addition, 5 deletionsarch/x86/kernel/vmiclock_32.c
- drivers/acpi/numa.c 2 additions, 2 deletionsdrivers/acpi/numa.c
- drivers/xen/events.c 6 additions, 2 deletionsdrivers/xen/events.c
Please register or sign in to comment