Merge branch 'intel_pstate' into pm-cpufreq-sched
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 16 Apr 2017 23:13:02 +0000 (01:13 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 16 Apr 2017 23:13:02 +0000 (01:13 +0200)

Trivial merge