]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e9914d fa1675b)
Merge branch 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 28 Jun 2013 10:58:30 +0000 (12:58 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 28 Jun 2013 10:58:30 +0000 (12:58 +0200)
* 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.

1  2 
drivers/acpi/device_pm.c patch | diff1 | diff2 | blob | history
include/acpi/acpi_bus.h patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/device_pm.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
local clone of linux.git