Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 05:40:00 +0000 (22:40 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 05:40:00 +0000 (22:40 -0700)
commitc71bd6944eb1458b7887af1783101f5a46140c40
tree97a7f30a1fb5b3cde3d9f3108779e612960056da
parent065a3e17baa36d1d48eb7376138820035b44775e
parent4ec223d02f4d5f5a3129edc0e3d22550d6ac8a32
Merge /pub/scm/linux/kernel/git/davej/cpufreq

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Fix ondemand vs suspend deadlock
  [CPUFREQ] Fix powernow-k8 SMP kernel on UP hardware bug.
  [PATCH] redirect speedstep-centrino maintainer mail to cpufreq list
  [CPUFREQ] correct powernow-k8 fid/vid masks for extended parts
  [CPUFREQ] Clarify powernow-k8 cpu_family statements