]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6e0a2d fbd2240 717e5d4)
Merge branches 'pm-sleep' and 'pm-runtime'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 14:26:14 +0000 (15:26 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 14:26:14 +0000 (15:26 +0100)
* pm-sleep:
  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

1  2  3 
include/linux/pm.h patch | diff1 | diff2 | diff3 | blob | history

diff --cc include/linux/pm.h
Simple merge
Linux kernel for KaRo TX COM modules