From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 26 Aug 2013 23:28:17 +0000 (+0200)
Subject: Merge branch 'acpi-pm'
X-Git-Tag: v3.12-rc1~178^2~15
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0ad4c9a9848fdd46dc422160efd947489a98bbc1;p=~emulex%2Finfiniband.git

Merge branch 'acpi-pm'

* acpi-pm:
  ACPI / PM: Add state information to error message in acpi_device_set_power()
  ACPI / PM: Remove redundant power manageable check from acpi_bus_set_power()
  ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere
  ACPI / PM: Make messages in acpi_device_set_power() print device names
  ACPI / PM: Only set power states of devices that are power manageable
---

0ad4c9a9848fdd46dc422160efd947489a98bbc1