Merge branch 'pm-cpufreq' into pm-cpu
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 7 Jul 2016 13:31:29 +0000 (15:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 7 Jul 2016 13:31:29 +0000 (15:31 +0200)

Trivial merge