diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-08-14 09:51:19 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-08-14 09:51:19 +0200 |
| commit | 8f0f2b621198bce551f83e87b71c6114b1a91a31 (patch) | |
| tree | 42ea6094008dc1762626756a40329ccf40e545b2 /drivers | |
| parent | 17bc3432e39d10ff50a090a37bbdabfca69467c5 (diff) | |
| parent | 88763a5cf80ca59a7c3bea32681ce8f697d9995f (diff) | |
| parent | a33733fc4891499dc170f9cff6c53a513dce24db (diff) | |
| download | linux-8f0f2b621198bce551f83e87b71c6114b1a91a31.tar.gz | |
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()