diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 10:06:44 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 10:06:44 +0100 |
commit | 442a5d000a4cabe8330074ad874da0f5ea47bb4f (patch) | |
tree | 9693e8258ddf51f705fb3d1a8dff0e634571380b /kernel | |
parent | 6f049e7c87fd60b9d2649c53e397741d50eb3d44 (diff) | |
parent | 8234f6734c5d74ac794e5517437f51c57d65f865 (diff) | |
parent | 96c6935212d632cb78db9149c61005b839e03b75 (diff) | |
parent | d32dcc6c6970667e438e2b1fec92816d98dcb29f (diff) | |
parent | 943a10f85265d4c14753d445003b6f5d8e3d959a (diff) | |
download | linux-442a5d000a4cabe8330074ad874da0f5ea47bb4f.tar.bz2 |
Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-sleep'
* pm-core:
PM-runtime: Switch autosuspend over to using hrtimers
* pm-qos:
PM / QoS: Change to use DEFINE_SHOW_ATTRIBUTE macro
* pm-domains:
PM / Domains: remove define_genpd_open_function() and define_genpd_debugfs_fops()
* pm-sleep:
PM / sleep: convert to DEFINE_SHOW_ATTRIBUTE