Skip to content
Commit ac2ecc2a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpuidle' and 'pm-cpufreq' into linux-next

* pm-cpuidle:
  cpuidle: dt: Clarify a comment and simplify code in dt_init_idle_driver()
  cpuidle: dt: Return the correct numbers of parsed idle states
  cpuidle: psci: Extend information in log about OSI/PC mode

* pm-cpufreq:
  cpufreq: intel_pstate: Allow EPP 0x80 setting by the firmware
  cpufreq: ACPI: Defer setting boost MSRs
  cpufreq: SPEAr: Make read-only array sys_clk_src static
  cpufreq: longhaul: Make array speeds static const
  cpufreq: ACPI: Use str_enabled_disabled() helper
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment