summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-12 01:10:19 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-12 01:10:19 +0100
commit476cc4333afb7cf3232c066d278c024b186e6d17 (patch)
treee95854db1ffbe6067ff1f348f1aef5eb5b49ba15
parentMerge branches 'acpi-scan', 'acpi-bus', 'acpi-osl' and 'acpi-pm' (diff)
parentACPI, PCI, irq: remove redundant check for null string pointer (diff)
parentACPI / spi: attach GPIO IRQ from ACPI description to SPI device (diff)
parentACPI / SBS: fix inconsistent indenting inside if statement (diff)
downloadlinux-476cc4333afb7cf3232c066d278c024b186e6d17.tar.xz
linux-476cc4333afb7cf3232c066d278c024b186e6d17.zip
Merge branches 'acpi-pci', 'acpi-irq' and 'acpi-assorted'
* acpi-pci: ACPI, PCI, irq: remove redundant check for null string pointer ACPI / PCI: Simplify acpi_penalize_isa_irq() ACPI, PCI, irq: remove interrupt number restriction ACPI, PCI, irq: remove interrupt count restriction * acpi-irq: ACPI / spi: attach GPIO IRQ from ACPI description to SPI device ACPI / gpio: Add irq_type when a GPIO is used as an interrupt ACPI: Rename acpi_gsi_get_irq_type to acpi_dev_get_irq_type and export symbol * acpi-assorted: ACPI / SBS: fix inconsistent indenting inside if statement ACPI: Fix build errors due objects compiled unconditionally