Merge back earlier 'pm-cpufreq' material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 26 Feb 2014 23:19:19 +0000 (00:19 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 26 Feb 2014 23:19:19 +0000 (00:19 +0100)

Trivial merge