From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2011 00:42:14 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
X-Git-Tag: v2.6.39-rc1~441
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb;p=pandora-kernel.git

Merge branch 'next' of git://git./linux/kernel/git/davej/cpufreq

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] pcc-cpufreq: remove duplicate statements
  [CPUFREQ] Remove the pm_message_t argument from driver suspend
  [CPUFREQ] Remove unneeded locks
  [CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files
  [CPUFREQ] Remove deprecated sysfs file sampling_rate_max
  [CPUFREQ] powernow-k8: The table index is not worth displaying
  [CPUFREQ] calculate delay after dbs_check_cpu
  [CPUFREQ] Add documentation for sampling_down_factor
  [CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons
---

61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb