tree e95854db1ffbe6067ff1f348f1aef5eb5b49ba15
parent 42d287d1a1e805ec98b5bdc4cca2660a56720ebd
parent 45288978859119c019eff93f0cb838a0de100bcc
parent 33ada67da352e138b6dbb372dccad6c3f13b15b2
parent a84bc8cfb2f2e2bb59f2ebdf531464c547f5026f
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1452557419 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1452557419 +0100

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