From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 25 Jul 2016 11:46:30 +0000 (+0200)
Subject: Merge branch 'pm-cpu'
X-Git-Tag: v4.8-rc1~158^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc841e260c95608921809a2c7481cf6f03bec21a;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'pm-cpu'

* pm-cpu:
  x86: remove duplicate turbo ratio limit MSRs
  tools/power turbostat: Replace MSR_NHM_TURBO_RATIO_LIMIT
  cpufreq: intel_pstate: Replace MSR_NHM_TURBO_RATIO_LIMIT
---

bc841e260c95608921809a2c7481cf6f03bec21a