From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 14 Aug 2018 07:51:19 +0000 (+0200)
Subject: Merge branches 'powercap' and 'pm-devfreq'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8f0f2b621198bce551f83e87b71c6114b1a91a31;p=linux.git

Merge branches 'powercap' and 'pm-devfreq'

Merge devfreq changes and a new CPU idle time injection framework
for 4.19.

* powercap:
  powercap / idle_inject: Add an idle injection framework

* pm-devfreq:
  PM / devfreq: rk3399_dmc: Fix duplicated opp table on reload.
  PM / devfreq: Init user limits from OPP limits, not viceversa
  PM / devfreq: rk3399_dmc: fix spelling mistakes.
  PM / devfreq: rk3399_dmc: do not print error when get supply and clk defer.
  dt-bindings: devfreq: rk3399_dmc: move interrupts to be optional.
  PM / devfreq: rk3399_dmc: remove wait for dcf irq event.
  dt-bindings: clock: add rk3399 DDR3 standard speed bins.
  dt-bindings: devfreq: rk3399_dmc: improve binding documentation.
  PM / devfreq: use put_device() instead of kfree()
  PM / devfreq: exynos-ppmu: Delete an error message for a failed memory allocation in exynos_ppmu_probe()
---

8f0f2b621198bce551f83e87b71c6114b1a91a31