Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 1 Oct 2006 07:40:35 +0000 (00:40 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 1 Oct 2006 07:40:35 +0000 (00:40 -0700)
commitf0b364a13d7fba001c0571d954f165dfaf5f434a
tree9cd8bf4e800295e5dbf279e63b9793223fd20577
parent5a73fdc5ea836d2edc5e02890b51185fe304d7d3
parentbfeeb0f57940b143a55dcc7ee88e8842108d9145
Merge /pub/scm/linux/kernel/git/davej/cpufreq

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Make acpi-cpufreq unsticky again.
  [CPUFREQ] longhaul: remove duplicated code.
  [CPUFREQ] Longhaul - Disable arbiter CLE266
  [CPUFREQ] Fix section mismatch warning
  [CPUFREQ] Fix cut-n-paste bug in suspend printk