tree fc92ee56f8f29b35f7d64debf107fb903d073951
parent a759012e5f9717a69c2c2f03d6c7fe435e150824
parent 362e77d1cb30c9a98e037641fae425687afa932e
parent 717e5d458e3bfca495a38dca61c64f274c049e46
parent 6a1c64cb401d14babf7df6307fe8ed5b9728df30
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1389567003 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1389567003 +0100

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