Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 21:28:20 +0000 (13:28 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 21:28:20 +0000 (13:28 -0800)

Trivial merge