diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-12 23:50:03 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-12 23:50:03 +0100 |
| commit | 4ff913373a77b99cbe3c5df3c76d2622006200d6 (patch) | |
| tree | fc92ee56f8f29b35f7d64debf107fb903d073951 /drivers/base | |
| parent | Merge branch 'pnp' (diff) | |
| parent | PM / hibernate: Call platform_leave() in suspend path too (diff) | |
| parent | PM / Runtime: Implement the pm_generic_runtime functions for CONFIG_PM (diff) | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko... (diff) | |
| download | linux-4ff913373a77b99cbe3c5df3c76d2622006200d6.tar.xz linux-4ff913373a77b99cbe3c5df3c76d2622006200d6.zip | |
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