]> git.hungrycats.org Git - linux/commitdiff
Merge home.osdl.org:/home/torvalds/v2.5/kconfig
authorLinus Torvalds <torvalds@home.osdl.org>
Tue, 6 Jan 2004 11:47:08 +0000 (03:47 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Tue, 6 Jan 2004 11:47:08 +0000 (03:47 -0800)
into home.osdl.org:/home/torvalds/v2.5/linux


Trivial merge