Merge branches 'pm-core', 'pm-opp' and 'pm-qos'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 3 Jul 2017 12:22:05 +0000 (14:22 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 3 Jul 2017 12:22:05 +0000 (14:22 +0200)
commitfb0356c4786ea97e5abdf06c98a29dd675187bd0
tree17524d553318c414a5674f54694cbcad8465412f
parent301f8d7463b1f3d1fdb56ee1cb4abb674094531d
parentcbcba35dba56f046bbd3437bd275ad3a7156cbc9
parent829a4e8c0e9aab17bcfe2ddb070388b8ada26292
parentdbb1d8b70c222544e9b54fdb3e22c15745be0155
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.