]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://linux-dj.bkbits.net/cpufreq
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 13 Apr 2004 01:52:00 +0000 (18:52 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 13 Apr 2004 01:52:00 +0000 (18:52 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
arch/i386/kernel/cpu/cpufreq/Kconfig

Simple merge