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)
commit0356dbb7fe87ba59558902e536d9f960e87353c1
tree2cb23f809c838f0bd7406845ea0a8e7cb5875c99
parente28cc71572da38a5a12c1cfe4d7032017adccf69
parent95235ca2c20ac0b31a8eb39e2d599bcc3e9c9a10
Merge /pub/scm/linux/kernel/git/davej/cpufreq