tree c946115b4215c95c91bc18e26fe41daa12ebdb44
parent 805c52815825b1ed2e3249508ce5ffa5aeae5d1d
parent e70dba6020eaaceb1d3619dfb535c719900c7091
parent 85dbb3d05ec6d063f6f8ad4d6dfc13793d566374
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1406498135 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1406498135 +0200

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