Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 00:24:34 +0000 (17:24 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 00:24:34 +0000 (17:24 -0700)

Trivial merge