]> git.hungrycats.org Git - linux/commitdiff
Merge mandrakesoft.com:/spare/vanilla/linus-2.5
authorJeff Garzik <jgarzik@mandrakesoft.com>
Wed, 20 Feb 2002 09:36:13 +0000 (04:36 -0500)
committerJeff Garzik <jgarzik@mandrakesoft.com>
Wed, 20 Feb 2002 09:36:13 +0000 (04:36 -0500)
into mandrakesoft.com:/spare/repo/net-drivers-2.5


Trivial merge