]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e030dbf 9a60ddb)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 13 Jul 2007 23:06:30 +0000 (16:06 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 13 Jul 2007 23:06:30 +0000 (16:06 -0700)
commitaf09f1e4b3214569de93bc9309c35014e5c8a3d0
treecb5dc861a5114fca5cd9e52e0d25f835bdd79c42tree | snapshot
parente030dbf91a87da7e8be3be3ca781558695bea683commit | diff
parent9a60ddbcb710ff78cd8c772681723a04e3f5aba3commit | diff
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>
Linux 2.6 source tree