diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-23 18:10:59 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-23 18:10:59 +0200 |
commit | db06391e05a6beb134ec506a64dedd21328606dc (patch) | |
tree | 4b7b8d6ea4f327fce080049b51fd7849ef85041a /mm/khugepaged.c | |
parent | 330e3932a4811e1628d962e47e6892e1e20eb9a7 (diff) | |
parent | 0070ea29623904224c0f5fa279a16a4ac9223295 (diff) | |
parent | 75af76d0a34e048651a6af311781d7206b6964c7 (diff) | |
download | linux-db06391e05a6beb134ec506a64dedd21328606dc.tar.bz2 |
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
* pm-cpufreq:
cpufreq: schedutil: restore cached freq when next_f is not changed
acpi-cpufreq: Honor _PSD table setting on new AMD CPUs
cpufreq: intel_pstate: Delete intel_pstate sysfs if failed to register the driver
cpufreq: Improve code around unlisted freq check
* pm-cpuidle:
intel_idle: Ignore _CST if control cannot be taken from the platform
cpuidle: Remove pointless stub
intel_idle: mention assumption that WBINVD is not needed
MAINTAINERS: Add section for cpuidle-psci PM domain