From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 28 Jun 2013 10:58:30 +0000 (+0200)
Subject: Merge branch 'acpi-pm'
X-Git-Tag: firefly_0821_release~176^2~5788^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3b4550e0e0cd24d8073dc571cecb0d4aa4ca3542;p=firefly-linux-kernel-4.4.55.git

Merge branch 'acpi-pm'

* acpi-pm:
  ACPI / PM: Rework and clean up acpi_dev_pm_get_state()
  ACPI / PM: Replace ACPI_STATE_D3 with ACPI_STATE_D3_COLD in device_pm.c
  ACPI / PM: Rename function acpi_device_power_state() and make it static
  ACPI / PM: acpi_processor_suspend() can be static
  xen / ACPI / sleep: Register an acpi_suspend_lowlevel callback.
  x86 / ACPI / sleep: Provide registration for acpi_suspend_lowlevel.
---

3b4550e0e0cd24d8073dc571cecb0d4aa4ca3542