Merge branch 'x86/urgent' into x86/irq
Merge reason: conflict in arch/x86/kernel/apic/io_apic.c
Resolved Conflicts:
arch/x86/kernel/apic/io_apic.c
Signed-off-by: 
H. Peter Anvin <hpa@zytor.com>
Showing
- arch/x86/ia32/ia32_aout.c 0 additions, 1 deletionarch/x86/ia32/ia32_aout.c
- arch/x86/include/asm/io_apic.h 1 addition, 0 deletionsarch/x86/include/asm/io_apic.h
- arch/x86/include/asm/system.h 2 additions, 2 deletionsarch/x86/include/asm/system.h
- arch/x86/kernel/acpi/boot.c 8 additions, 6 deletionsarch/x86/kernel/acpi/boot.c
- arch/x86/kernel/apic/apic.c 0 additions, 17 deletionsarch/x86/kernel/apic/apic.c
- arch/x86/kernel/apic/io_apic.c 51 additions, 3 deletionsarch/x86/kernel/apic/io_apic.c
- arch/x86/kernel/apic/probe_32.c 27 additions, 2 deletionsarch/x86/kernel/apic/probe_32.c
- arch/x86/kernel/apic/probe_64.c 1 addition, 1 deletionarch/x86/kernel/apic/probe_64.c
- arch/x86/kernel/mpparse.c 0 additions, 7 deletionsarch/x86/kernel/mpparse.c
- arch/x86/kernel/reboot.c 8 additions, 0 deletionsarch/x86/kernel/reboot.c
- arch/x86/kernel/smpboot.c 0 additions, 2 deletionsarch/x86/kernel/smpboot.c
- arch/x86/mm/gup.c 1 addition, 1 deletionarch/x86/mm/gup.c
- drivers/char/agp/amd64-agp.c 4 additions, 1 deletiondrivers/char/agp/amd64-agp.c
Please register or sign in to comment