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

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Don't take semaphore in cpufreq_quick_get()
  [CPUFREQ] Support different families in fid/did to frequency conversion
  [CPUFREQ] cpufreq_stats: misc cpuinit section annotations
  [CPUFREQ] implement !CONFIG_CPU_FREQ stub for  cpufreq_unregister_notifier()
  [CPUFREQ] mark hotplug notifier callback as __cpuinit
  [CPUFREQ] Only check for transition latency on problematic governors (kconfig fix)
  [CPUFREQ] allow ondemand and conservative cpufreq governors to be used as default
  [CPUFREQ] move policy's governor initialisation out of low-level drivers into cpufreq core
  [CPUFREQ] Longhaul - Add support for PM133 northbridge
  [CPUFREQ] x86: use num_online_nodes to get physical cpus numbers for

diff --cc arch/powerpc/platforms/cell/cbe_cpufreq.c
Simple merge

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

diff --cc arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/e_powersaver.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/elanfreq.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/longhaul.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/powernow-k6.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/powernow-k7.c
Simple merge

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

diff --cc arch/x86/kernel/cpu/cpufreq/sc520_freq.c
Simple merge

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

diff --cc arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/speedstep-smi.c
Simple merge