]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit68d6086fc5cda6abc0381b607e323bbc4ddd3415
treeb4e7ad26495368517ce8e1f6c5d41beb9dccb79btree | snapshot
parentd6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbccommit | diff
parentfbd22402164e687fd1be9a1372ee4f6b9373c860commit | diff
parent717e5d458e3bfca495a38dca61c64f274c049e46commit | diff
Merge branches 'pm-sleep' and 'pm-runtime'

* 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
include/linux/pm.h diff1 | diff2 | diff3 | blob | history
Linux kernel for KaRo TX COM modules