tree 5af71c440627225138518669653c427e901d8e33
parent 98b96173c777c67daaa7d163a35e591e1928a164
parent 2e4976206396274cf66590328c6913811c271495
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1178325528 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1178325528 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Report the number of processors in PowerNow-k8 correctly
  [CPUFREQ] do not declare undefined functions
  [CPUFREQ] cleanup kconfig options
  [CPUFREQ] Longhaul - Revert Longhaul ver. 2
  [CPUFREQ] Remove deprecated /proc/acpi/processor/performance write support
  [CPUFREQ] Fix limited cpufreq when booted on battery
  Fix preemption warnings in speedstep-centrino.c
  [CPUFREQ] Longhaul - Correct PCI code
  [CPUFREQ] p4-clockmod: switch to rdmsr_on_cpu/wrmsr_on_cpu