From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 25 Oct 2012 23:52:51 +0000 (+0200)
Subject: Merge branch 'pm-cpufreq-next' into linux-next
X-Git-Tag: next-20121029~40^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=11fba233341a4f0c6caebe0b6af01b6600af27cf;p=karo-tx-linux.git

Merge branch 'pm-cpufreq-next' into linux-next

* pm-cpufreq-next:
  cpufreq: Fix sparse warning by making local function static
  cpufreq: Fix sparse warnings by updating cputime64_t to u64
  cpufreq: governors: remove redundant code
  cpufreq: return early from __cpufreq_driver_getavg()
  cpufreq: fix jiffies/cputime mixup in conservative/ondemand governors
  cpufreq: Improve debug prints
  cpufreq: Move common part from governors to separate file, v2
  cpufreq / core: Fix printing of governor and driver name
  cpufreq / core: Fix typo in comment describing show_bios_limit()
---

11fba233341a4f0c6caebe0b6af01b6600af27cf