Merge branch 'pm-cpu'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Jul 2016 11:46:30 +0000 (13:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Jul 2016 11:46:30 +0000 (13:46 +0200)
commitbc841e260c95608921809a2c7481cf6f03bec21a
tree2c2863c2b4024ac8c9de72eaa9e032f417d5d4d1
parente717a62d3602e41d4b0f9cd2d18e6851d33a2150
parenta0c9b8cc43e0acada4574b33a19b5178520f1218
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
drivers/cpufreq/intel_pstate.c