Commit 5302e2a3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpuidle' and 'pm-cpufreq' 

* pm-cpuidle:
  cpuidle: governors: menu: Avoid using invalid recent intervals data
  intel_idle: Allow loading ACPI tables for any family

* pm-cpufreq:
  cpufreq: intel_pstate: Support Clearwater Forest OOB mode
parents fa3fa55d 3ead7798

drivers/cpufreq/intel_pstate.c

+1 −0
Original line number Diff line number Diff line
@@ -2793,6 +2793,7 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { 
	X86_MATCH(INTEL_GRANITERAPIDS_X,	core_funcs),

	X86_MATCH(INTEL_ATOM_CRESTMONT,		core_funcs),

	X86_MATCH(INTEL_ATOM_CRESTMONT_X,	core_funcs),

	X86_MATCH(INTEL_ATOM_DARKMONT_X,	core_funcs),

	{}

};

#endif