Merge back earlier 'pm-cpufreq' material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 8 May 2014 11:06:38 +0000 (13:06 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 8 May 2014 11:06:38 +0000 (13:06 +0200)

Trivial merge