]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-dj.bkbits.net/cpufreq
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 3 Jun 2004 13:48:12 +0000 (06:48 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 3 Jun 2004 13:48:12 +0000 (06:48 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge