tree cb5dc861a5114fca5cd9e52e0d25f835bdd79c42
parent e030dbf91a87da7e8be3be3ca781558695bea683
parent 9a60ddbcb710ff78cd8c772681723a04e3f5aba3
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184367990 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184367990 -0700

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

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Fix typos in powernow-k8 printk's.
  [CPUFREQ] Restore previously used governor on a hot-replugged CPU
  [CPUFREQ] bugfix cpufreq in combination with performance governor
  [CPUFREQ] powernow-k8 compile fix.
  [CPUFREQ] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI
  [CPUFREQ] Longhaul - Option to disable ACPI C3 support

Fixed up arch/i386/kernel/cpu/cpufreq/powernow-k8.c due to revert that
got fixed differently in the cpufreq branch.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>