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
This commit is contained in:
Rafael J. Wysocki 2013-11-19 01:07:00 +01:00
commit 9bad584548
3 changed files with 4 additions and 4 deletions