Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:21:26 +0000 (16:21 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:21:26 +0000 (16:21 -0800)

Trivial merge