summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-08-03 20:29:24 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-08-03 20:29:24 +0200
commit8a05c3115dc0f239b46659d9d190e370d6413ff1 (patch)
treef7ff1d1f55bc8365a05ea920e78df7ca6e66941f /drivers/cpufreq
parent16f73eb02d7e1765ccab3d2018e0bd98eb93d973 (diff)
parent4815d3c56d1e10449a44089a47544d9ba84fad0d (diff)
parentc2e3af11a979688bc9b9229867688e89e343a465 (diff)
parent22baebd489c78cf7d02030bf50b0c99e4fcb6748 (diff)
downloadlinux-8a05c3115dc0f239b46659d9d190e370d6413ff1.tar.bz2
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