summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/apei/apei-base.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-12-15 15:27:16 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-12-15 15:27:16 +0100
commitb3fac817830306328d5195e7f4fb332277f3b146 (patch)
treea3a17a69279504782a09b8547e3662a788c6ffa3 /drivers/acpi/apei/apei-base.c
parentMerge branches 'pm-sleep', 'pm-acpi', 'pm-domains' and 'powercap' (diff)
parentMerge tag 'devfreq-next-for-5.11' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentMerge tag 'linux-cpupower-5.11-rc1' of git://git.kernel.org/pub/scm/linux/ker... (diff)
downloadlinux-b3fac817830306328d5195e7f4fb332277f3b146.tar.xz
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