diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-04 00:04:49 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-04 00:04:49 +0200 |
| commit | 45a7953c831c5885a4c6eddeeda4fe7628b3a96d (patch) | |
| tree | e6b20a5f5bd9dc6956f442af2f8ad276c531cffb /kernel | |
| parent | 569dbb88e80deb68974ef6fdd6a13edb9d686261 (diff) | |
| parent | 820b9b0c093ebd40c4b8e44c0e84613c877f4948 (diff) | |
| parent | 762792913f8c71fb4807b25540347e4ace1b5b95 (diff) | |
| parent | ea11e94badab2d4d58f9415d0211bc5f85d9d0a9 (diff) | |
| parent | 313c8c16ee62b32b8b40c6b00637b401dc19050e (diff) | |
| parent | 9d913e43436c840020478463bd72098d8bf1556d (diff) | |
Merge branches 'pm-core', 'pm-opp', 'pm-domains', 'pm-cpu' and 'pm-avs'
* pm-core:
PM / wakeup: Set power.can_wakeup if wakeup_sysfs_add() fails
* pm-opp:
PM / OPP: Fix get sharing CPUs when hotplug is used
PM / OPP: OF: Use pr_debug() instead of pr_err() while adding OPP table
* pm-domains:
PM / Domains: Convert to using %pOF instead of full_name
PM / Domains: Extend generic power domain debugfs
PM / Domains: Add time accounting to various genpd states
* pm-cpu:
PM / CPU: replace raw_notifier with atomic_notifier
* pm-avs:
PM / AVS: rockchip-io: add io selectors and supplies for RV1108