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)
commit91af125c33af02340355b96a6ed0761e5132cde0
treec946115b4215c95c91bc18e26fe41daa12ebdb44
parent805c52815825b1ed2e3249508ce5ffa5aeae5d1d
parente70dba6020eaaceb1d3619dfb535c719900c7091
parent85dbb3d05ec6d063f6f8ad4d6dfc13793d566374
Merge branches 'acpi-pnp' and 'acpi-pci'

* 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()
drivers/acpi/internal.h
drivers/pci/pci-acpi.c
include/acpi/acpi_bus.h