Merge branch 'pm-cpufreq' into pm-opp
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Aug 2015 01:25:16 +0000 (03:25 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Aug 2015 01:25:16 +0000 (03:25 +0200)

Trivial merge