tree 69df1e3566d4174e4b79438be0bd427b813d6339
parent 77aa26514a3858cabce748fa093d871b5a51d269
parent aae467c79b14db0d286764ed9ddbaefe3715ebd2
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1384819620 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1384819620 +0100

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