From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 12 Jan 2014 22:50:03 +0000 (+0100)
Subject: Merge branches 'pm-sleep', 'pm-runtime' and 'pm-apm'
X-Git-Tag: v3.14-rc1~107^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4ff913373a77b99cbe3c5df3c76d2622006200d6;p=linux.git

Merge branches 'pm-sleep', 'pm-runtime' and 'pm-apm'

* pm-sleep:
  PM / hibernate: Call platform_leave() in suspend path too
  PM / Sleep: Add macro to define common late/early system PM callbacks
  PM / hibernate: export hibernation_set_ops

* pm-runtime:
  PM / Runtime: Implement the pm_generic_runtime functions for CONFIG_PM
  PM / Runtime: Add second macro for definition of runtime PM callbacks

* pm-apm:
  apm-emulation: add hibernation APM events to support suspend2disk
---

4ff913373a77b99cbe3c5df3c76d2622006200d6