aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-12 23:50:03 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-12 23:50:03 +0100
commit4ff913373a77b99cbe3c5df3c76d2622006200d6 (patch)
treefc92ee56f8f29b35f7d64debf107fb903d073951 /drivers/char
parenta759012e5f9717a69c2c2f03d6c7fe435e150824 (diff)
parent362e77d1cb30c9a98e037641fae425687afa932e (diff)
parent717e5d458e3bfca495a38dca61c64f274c049e46 (diff)
parent6a1c64cb401d14babf7df6307fe8ed5b9728df30 (diff)
downloadlinux-linaro-stable-4ff913373a77b99cbe3c5df3c76d2622006200d6.tar.gz
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