]> git.hungrycats.org Git - linux/commitdiff
Merge ppc970.osdl.org:/home/torvalds/v2.5/mips
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 20 Feb 2004 09:33:47 +0000 (01:33 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 20 Feb 2004 09:33:47 +0000 (01:33 -0800)
into ppc970.osdl.org:/home/torvalds/v2.5/linux

1  2 
arch/mips/Kconfig

Simple merge