]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e1a8ff 362e77d 717e5d4)
Merge branches 'pm-sleep' and 'pm-runtime'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Jan 2014 22:06:15 +0000 (23:06 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Jan 2014 22:06:15 +0000 (23:06 +0100)
commit2e96f78d5f677125c8bc3670aaf115eb4447ff27
tree4ebe15d97d3fc539e7c5dca536800f7ddb84a1aetree | snapshot
parent1e1a8ff7eb01db1cad390a581ce9c54063b6d629commit | diff
parent362e77d1cb30c9a98e037641fae425687afa932ecommit | diff
parent717e5d458e3bfca495a38dca61c64f274c049e46commit | 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
include/linux/pm.h diff1 | diff2 | diff3 | blob | history
Linux kernel for KaRo TX COM modules