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

Browse source

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

...

This commit is contained in:

Linus Torvalds 2007-07-13 16:06:30 -07:00

parent e030dbf91a 9a60ddbcb7

commit af09f1e4b3

7 changed files with 67 additions and 320 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

18

arch/i386/kernel/cpu/cpufreq/Kconfig

View file

7

arch/i386/kernel/cpu/cpufreq/longhaul.c

View file

29

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

View file

276

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

View file

6

arch/x86_64/kernel/cpufreq/Kconfig

View file