Merge back earlier 'pm-cpufreq' material.
authorRafael J. Wysocki <rjw@rjwysocki.net>
Fri, 25 Oct 2013 20:36:40 +0000 (22:36 +0200)
committerRafael J. Wysocki <rjw@rjwysocki.net>
Fri, 25 Oct 2013 20:36:40 +0000 (22:36 +0200)
Conflicts:
drivers/cpufreq/omap-cpufreq.c


Trivial merge