diff options
| author | Rafael J. Wysocki | 2017-08-17 21:00:30 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2017-08-17 21:00:30 +0200 |
| commit | 8179962b84668d71586cd3efcb70e823f37a5702 (patch) | |
| tree | 406df08e9216516d057e3c7b6ede926c845637fa /arch | |
| parent | ef954844c7ace62f773f4f23e28d2d915adc419f (diff) | |
| parent | c587c79f90632df59c61383c6abebb2e07a81911 (diff) | |
| parent | 8e2f3bce05e056575c2c84a344a8291fdabb5f21 (diff) | |
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