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

diff --cc arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
Simple merge

diff --cc arch/i386/kernel/cpu/cpufreq/powernow-k8.c
Simple merge

diff --cc arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
Simple merge

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_stats.c
Simple merge