From: Linus Torvalds Date: Fri, 13 Jul 2007 23:06:30 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq X-Git-Tag: v2.6.23-rc1~1076 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af09f1e4b3214569de93bc9309c35014e5c8a3d0;p=linux-2.6 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 --- af09f1e4b3214569de93bc9309c35014e5c8a3d0