Commit 570d58b1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v6.15-rc5' into x86/msr, to pick up fixes and to resolve conflicts 



 Conflicts:
	drivers/cpufreq/intel_pstate.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 502ad6e5 92a09c47
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment