Merge branch 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 Nov 2013 00:07:00 +0000 (01:07 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 Nov 2013 00:07:00 +0000 (01:07 +0100)
commit9bad5845485ec22b31d4489c3bd6d96d78442437
tree69df1e3566d4174e4b79438be0bd427b813d6339
parent77aa26514a3858cabce748fa093d871b5a51d269
parentaae467c79b14db0d286764ed9ddbaefe3715ebd2
Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: governor: Remove fossil comment in the cpufreq_governor_dbs()
  cpufreq: OMAP: Fix compilation error 'r & ret undeclared'
  cpufreq: conservative: set requested_freq to policy max when it is over policy max