From: Rafael J. Wysocki Date: Wed, 24 Oct 2012 20:17:27 +0000 (+0200) Subject: Merge branch 'pm-cpufreq-next' into linux-next X-Git-Tag: next-20121025~36^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ab0c259d7c623019138669804204ff3d4e1d211c;p=karo-tx-linux.git Merge branch 'pm-cpufreq-next' into linux-next * pm-cpufreq-next: 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() --- ab0c259d7c623019138669804204ff3d4e1d211c