diff options
| author |  Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2017-07-03 14:22:05 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2017-07-03 14:22:05 +0200 |
| commit | fb0356c4786ea97e5abdf06c98a29dd675187bd0 (patch) | |
| tree | 17524d553318c414a5674f54694cbcad8465412f /drivers/base | |
| parent | Merge branch 'pm-sleep' (diff) | |
| parent | PM / sysfs: Constify attribute groups (diff) | |
| parent | PM / OPP: Add dev_pm_opp_{set|put}_clkname() (diff) | |
| parent | PM / QoS: constify *_attribute_group. (diff) | |
| download | linux-fb0356c4786ea97e5abdf06c98a29dd675187bd0.tar.gz linux-fb0356c4786ea97e5abdf06c98a29dd675187bd0.tar.bz2 linux-fb0356c4786ea97e5abdf06c98a29dd675187bd0.zip | |
Merge branches 'pm-core', 'pm-opp' and 'pm-qos'
* pm-core:
PM / sysfs: Constify attribute groups
PM: Constify info string used in messages
PM: Constify returned PM event name
PM / wakeirq: Convert to SRCU
* pm-opp:
PM / OPP: Add dev_pm_opp_{set|put}_clkname()
PM / OPP: Use - instead of @ for DT entries
PM / OPP: Don't create debugfs "supply-0" directory unnecessarily
PM / OPP: opp-microvolt is not optional if regulators are set
PM / OPP: Don't create copy of regulators unnecessarily
PM / OPP: Reorganize _generic_set_opp_regulator()
* pm-qos:
PM / QoS: constify *_attribute_group.