]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-sleep', 'pm-runtime' and 'pm-apm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Jan 2014 22:50:03 +0000 (23:50 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Jan 2014 22:50:03 +0000 (23:50 +0100)
commitc389f56cad904ade80c81960554152a2f07bba17
treefc92ee56f8f29b35f7d64debf107fb903d073951
parentfe6274bc415bbc578bbb44f88924cd30b80d54ce
parentc56d53bc1016bb52e684da607b8bf5da9e33bf90
parent3509ab12d0750ae364291ef92981c2bbb1d708ee
parent187f73db1a77098887dc644fc5add9cc653cdc37
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
include/linux/pm.h