Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'
* pm-cpufreq: cpufreq: intel_pstate: hybrid: Rework HWP calibration ACPI: CPPC: Introduce cppc_get_nominal_perf() * pm-sleep: PM: sleep: core: Avoid setting power.must_resume to false PM: sleep: wakeirq: drop useless parameter from dev_pm_attach_wake_irq() * pm-em: Documentation: power: include kernel-doc in Energy Model doc PM: EM: fix kernel-doc comments
No related branches found
No related tags found
Showing
- Documentation/power/energy-model.rst 12 additions, 3 deletionsDocumentation/power/energy-model.rst
- drivers/acpi/cppc_acpi.c 31 additions, 16 deletionsdrivers/acpi/cppc_acpi.c
- drivers/base/power/main.c 1 addition, 1 deletiondrivers/base/power/main.c
- drivers/base/power/wakeirq.c 4 additions, 7 deletionsdrivers/base/power/wakeirq.c
- drivers/cpufreq/intel_pstate.c 71 additions, 114 deletionsdrivers/cpufreq/intel_pstate.c
- include/acpi/cppc_acpi.h 5 additions, 0 deletionsinclude/acpi/cppc_acpi.h
- include/linux/energy_model.h 4 additions, 4 deletionsinclude/linux/energy_model.h
Loading
Please register or sign in to comment