diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-08-17 21:00:30 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-08-17 21:00:30 +0200 |
| commit | 8179962b84668d71586cd3efcb70e823f37a5702 (patch) | |
| tree | 406df08e9216516d057e3c7b6ede926c845637fa /drivers | |
| parent | Linux 4.13-rc5 (diff) | |
| parent | cpufreq: intel_pstate: report correct CPU frequencies during trace (diff) | |
| parent | cpufreq: x86: Disable interrupts during MSRs reading (diff) | |
| download | linux-dev-8179962b84668d71586cd3efcb70e823f37a5702.tar.xz linux-dev-8179962b84668d71586cd3efcb70e823f37a5702.zip | |
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