From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 12 Jan 2016 00:10:03 +0000 (+0100)
Subject: Merge branches 'acpi-scan', 'acpi-bus', 'acpi-osl' and 'acpi-pm'
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=42d287d1a1e805ec98b5bdc4cca2660a56720ebd;p=deliverable%2Flinux.git

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

42d287d1a1e805ec98b5bdc4cca2660a56720ebd