aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-08-14 09:51:19 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-08-14 09:51:19 +0200
commit8f0f2b621198bce551f83e87b71c6114b1a91a31 (patch)
tree42ea6094008dc1762626756a40329ccf40e545b2
parentMerge branches 'pm-core', 'pm-domains', 'pm-sleep', 'acpi-pm' and 'pm-cpuidle' (diff)
parentpowercap / idle_inject: Add an idle injection framework (diff)
parentMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq (diff)
downloadlinux-dev-8f0f2b621198bce551f83e87b71c6114b1a91a31.tar.xz
linux-dev-8f0f2b621198bce551f83e87b71c6114b1a91a31.zip
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()