diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-15 15:27:16 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-15 15:27:16 +0100 |
commit | b3fac817830306328d5195e7f4fb332277f3b146 (patch) | |
tree | a3a17a69279504782a09b8547e3662a788c6ffa3 /drivers/watchdog/qcom-wdt.c | |
parent | 42b4ca04cbfde952e7be132ffc7226890323bbe1 (diff) | |
parent | d3569c149dfe05f1e6e322d4851eed42dbad3df6 (diff) | |
parent | f8edfa6d1e077011cb567b35c29cb7a73c266d91 (diff) | |
download | linux-b3fac817830306328d5195e7f4fb332277f3b146.tar.gz linux-b3fac817830306328d5195e7f4fb332277f3b146.tar.bz2 linux-b3fac817830306328d5195e7f4fb332277f3b146.zip |
Merge branches 'pm-devfreq' and 'pm-tools'
* pm-devfreq:
PM / devfreq: tegra30: Separate configurations per-SoC generation
PM / devfreq: tegra30: Support interconnect and OPPs from device-tree
PM / devfreq: tegra20: Deprecate in a favor of emc-stat based driver
PM / devfreq: exynos-bus: Add registration of interconnect child device
dt-bindings: devfreq: Add documentation for the interconnect properties
soc/tegra: fuse: Add stub for tegra_sku_info
soc/tegra: fuse: Export tegra_read_ram_code()
clk: tegra: Export Tegra20 EMC kernel symbols
PM / devfreq: tegra30: Silence deferred probe error
PM / devfreq: tegra20: Relax Kconfig dependency
PM / devfreq: tegra20: Silence deferred probe error
PM / devfreq: Remove redundant governor_name from struct devfreq
PM / devfreq: Add governor attribute flag for specifc sysfs nodes
PM / devfreq: Add governor feature flag
PM / devfreq: Add tracepoint for frequency changes
PM / devfreq: Unify frequency change to devfreq_update_target func
trace: events: devfreq: Use fixed indentation size to improve readability
* pm-tools:
pm-graph v5.8
cpupower: Provide online and offline CPU information