Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 23:09:20 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 23:09:20 +0000 (15:09 -0800)

Trivial merge