From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 5 May 2007 00:38:48 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=ded1504dfa0083661fdd1a0a5f021cb7313ffe04;p=linux-edison.git

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

ded1504dfa0083661fdd1a0a5f021cb7313ffe04