]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-dj.bkbits.net/cpufreq
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 14 Jun 2004 06:22:09 +0000 (23:22 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 14 Jun 2004 06:22:09 +0000 (23:22 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge