Merge branches 'acpi-pnp' and 'acpi-pci'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 27 Jul 2014 21:55:35 +0000 (23:55 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 27 Jul 2014 21:55:35 +0000 (23:55 +0200)
* acpi-pnp:
  ACPI / PNP: Use ACPI_COMPANION() instead of ACPI_HANDLE()
  ACPI / PNP: do ACPI binding directly

* acpi-pci:
  ACPI / PCI: Use ACPI_COMPANION() instead of ACPI_HANDLE()


Trivial merge