Merge back earlier 'pm-cpufreq' material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 17 Mar 2014 12:51:39 +0000 (13:51 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 17 Mar 2014 12:51:39 +0000 (13:51 +0100)

Trivial merge