Merge branches 'pm-cpufreq-x86', 'pm-cpufreq-docs' and 'intel_pstate'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Aug 2017 18:29:24 +0000 (20:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Aug 2017 18:29:24 +0000 (20:29 +0200)
commit8a05c3115dc0f239b46659d9d190e370d6413ff1
treef7ff1d1f55bc8365a05ea920e78df7ca6e66941f
parent16f73eb02d7e1765ccab3d2018e0bd98eb93d973
parent4815d3c56d1e10449a44089a47544d9ba84fad0d
parentc2e3af11a979688bc9b9229867688e89e343a465
parent22baebd489c78cf7d02030bf50b0c99e4fcb6748
Merge branches 'pm-cpufreq-x86', 'pm-cpufreq-docs' and 'intel_pstate'

* pm-cpufreq-x86:
  cpufreq: x86: Make scaling_cur_freq behave more as expected

* pm-cpufreq-docs:
  cpufreq: docs: Add missing cpuinfo_cur_freq description

* intel_pstate:
  cpufreq: intel_pstate: Drop ->get from intel_pstate structure
drivers/cpufreq/intel_pstate.c