From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 12 Jan 2016 00:10:19 +0000 (+0100)
Subject: Merge branches 'acpi-pci', 'acpi-irq' and 'acpi-assorted'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=476cc4333afb7cf3232c066d278c024b186e6d17;p=deliverable%2Flinux.git

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
---

476cc4333afb7cf3232c066d278c024b186e6d17