From: Linus Torvalds Date: Tue, 18 May 2010 16:15:57 +0000 (-0700) Subject: Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: MMI-PSA29.97-13-9~23913 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=98f01720cbe3e2eb719682777049b6514e9db556;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'x86-irq-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, acpi/irq: Define gsi_end when X86_IO_APIC is undefined x86, irq: Kill io_apic_renumber_irq x86, acpi/irq: Handle isa irqs that are not identity mapped to gsi's. x86, ioapic: Simplify probe_nr_irqs_gsi. x86, ioapic: Optimize pin_2_irq x86, ioapic: Move nr_ioapic_registers calculation to mp_register_ioapic. x86, ioapic: In mpparse use mp_register_ioapic x86, ioapic: Teach mp_register_ioapic to compute a global gsi_end x86, ioapic: Fix the types of gsi values x86, ioapic: Fix io_apic_redir_entries to return the number of entries. x86, ioapic: Only export mp_find_ioapic and mp_find_ioapic_pin in io_apic.h x86, acpi/irq: Generalize mp_config_acpi_legacy_irqs x86, acpi/irq: Fix acpi_sci_ioapic_setup so it has both bus_irq and gsi x86, acpi/irq: pci device dev->irq is an isa irq not a gsi x86, acpi/irq: Teach acpi_get_override_irq to take a gsi not an isa_irq x86, acpi/irq: Introduce apci_isa_irq_to_gsi --- 98f01720cbe3e2eb719682777049b6514e9db556