tree 2c6b7a4357ba85f7be027bd492da9bf8d7c6acb2
parent 77aa56ba09b7416764aec2e3f7b41e023cf30602
parent bdce2595a2f539c6fdedd8f2bd281326b627bba3
author Linus Torvalds <torvalds@linux-foundation.org> 1300408934 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300408934 -0700

Merge branch 'next' of git://git.kernel.org/pub/scm/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