From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 19 Nov 2013 00:07:00 +0000 (+0100)
Subject: Merge branch 'pm-cpufreq'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9bad5845485ec22b31d4489c3bd6d96d78442437;p=linux-beck.git

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
---

9bad5845485ec22b31d4489c3bd6d96d78442437