Merge branches 'acpi-scan', 'acpi-bus', 'acpi-osl' and 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Jan 2016 00:10:03 +0000 (01:10 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Jan 2016 00:10:03 +0000 (01:10 +0100)
commit42d287d1a1e805ec98b5bdc4cca2660a56720ebd
tree0c92f8d94a86f1660c2443c0b8b065591692094f
parentb12745cce2c903ff8e84ebbd1f8632063156d194
parentedc345d88462c78cd43d44e38efc9cadae4266f1
parent76c599bcab26795b0669694e1e32a78274cb901b
parent9d128ed17c672b1dffde4a328e9b3ee26d87a8f0
parentcd7f84c02825cfca6cc86826395167479bdc1a05
Merge branches 'acpi-scan', 'acpi-bus', 'acpi-osl' and 'acpi-pm'

* acpi-scan:
  ACPI: Fix white space in a structure definition
  ACPI / utils: Add acpi_dev_present()
  ACPI / scan: Fix acpi_bus_id_list bookkeeping
  ACPI / scan: set status to 0 if _STA failed

* acpi-bus:
  ACPI / bus: Show _OSC UUID when _OSC fails
  ACPI / bus: Tidy up _OSC error spacing

* acpi-osl:
  ACPI / OSL: Add kerneldoc comments to memory mapping functions

* acpi-pm:
  ACPI / PM: Support D3 COLD device in old BIOS for ZPODD
drivers/acpi/bus.c
drivers/acpi/osl.c
include/acpi/acpi_bus.h