Merge back earlier 'pm-cpufreq' material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 22 Aug 2013 22:55:13 +0000 (00:55 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 22 Aug 2013 22:55:13 +0000 (00:55 +0200)

Trivial merge