Merge /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