From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 17 Aug 2017 19:00:30 +0000 (+0200)
Subject: Merge branches 'intel_pstate-fix' and 'cpufreq-x86-fix'
X-Git-Tag: v4.13~95^2
X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-artful-kernel.git;a=commitdiff_plain;h=8179962b84668d71586cd3efcb70e823f37a5702

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
---

8179962b84668d71586cd3efcb70e823f37a5702