diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-08 15:08:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-08 15:08:08 +0100 |
| commit | 2ec11fba54ed15c4fe1fc79043617f38c0d17363 (patch) | |
| tree | 2d7b5d0e5d028ba5eb1f64ee682bef382884dff8 | |
| parent | 2195880e288439b4abb59977caba62ec8b64b791 (diff) | |
| parent | 362e77d1cb30c9a98e037641fae425687afa932e (diff) | |
| parent | 717e5d458e3bfca495a38dca61c64f274c049e46 (diff) | |
Merge branches 'pm-sleep' and 'pm-runtime'
* 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