diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-21 14:14:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-21 14:14:31 +0200 |
| commit | 7553a72bb19fd0d952b57e195343911f0f9ed85a (patch) | |
| tree | cd05d8504b53dcbba9c500ab8f82624390500feb | |
| parent | 7a0f9d1eb51ff25d119b48fe7cc6aa0433cd6621 (diff) | |
| parent | 47e5abfb546a3ace23a77453dc2e9db92704c5ac (diff) | |
| parent | 3477accaece59199484c4b7586c88235e265f3d0 (diff) | |
| download | linux-7553a72bb19fd0d952b57e195343911f0f9ed85a.tar.bz2 | |
Merge branches 'pm-core' and 'pm-opp'
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