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

Documentation/cpu-freq/governors.txt

arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c

arch/i386/kernel/cpu/cpufreq/powernow-k8.c

arch/i386/kernel/cpu/cpufreq/powernow-k8.h

arch/i386/kernel/cpu/cpufreq/speedstep-ich.c

arch/i386/kernel/cpu/cpufreq/speedstep-lib.c

arch/i386/kernel/cpu/cpufreq/speedstep-lib.h

arch/i386/kernel/cpu/cpufreq/speedstep-smi.c

arch/i386/kernel/cpu/proc.c

arch/ia64/kernel/setup.c

arch/x86_64/kernel/setup.c

drivers/cpufreq/cpufreq.c

drivers/cpufreq/cpufreq_conservative.c

drivers/cpufreq/cpufreq_ondemand.c

include/linux/cpufreq.h