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

Merge branches 'intel_pstate-fix' and 'cpufreq-x86-fix' 

* intel_pstate-fix:
  cpufreq: intel_pstate: report correct CPU frequencies during trace

* cpufreq-x86-fix:
  cpufreq: x86: Disable interrupts during MSRs reading
parents ef954844 c587c79f 8e2f3bce
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment