Merge branches 'intel_pstate-fix' and 'cpufreq-x86-fix'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Aug 2017 19:00:30 +0000 (21:00 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Aug 2017 19:00:30 +0000 (21:00 +0200)
* intel_pstate-fix:
  cpufreq: intel_pstate: report correct CPU frequencies during trace

* cpufreq-x86-fix:
  cpufreq: x86: Disable interrupts during MSRs reading


Trivial merge