Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Nov 2007 02:30:26 +0000 (18:30 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Nov 2007 02:30:26 +0000 (18:30 -0800)
commit4c5cdb1e1f2a502069f57a60b5c6b97b8106c73c
tree1067a3ce7dd39f3ac3aa3b961b1f0612507f694e
parent8c0863403f109a43d7000b4646da4818220d501f
parent18a7247d1bb2e2dcbab628d7e786d03df5bf1eed
Merge /pub/scm/linux/kernel/git/davej/cpufreq

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Fix up whitespace in conservative governor.
  [CPUFREQ] Make cpufreq_conservative handle out-of-sync events properly
  [CPUFREQ] architectural pstate driver for powernow-k8
arch/x86/kernel/cpu/cpufreq/powernow-k8.c
arch/x86/kernel/cpu/cpufreq/powernow-k8.h