Merge branches 'pm-core' and 'pm-opp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 21 Jun 2018 12:14:31 +0000 (14:14 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 21 Jun 2018 12:14:31 +0000 (14:14 +0200)
These are a PM core fix and an OPP framework fix for 4.18-rc2,
both "stable" material.

* pm-core:
  PM / core: Fix supplier device runtime PM usage counter imbalance

* pm-opp:
  PM / OPP: Update voltage in case freq == old_freq


Trivial merge