]> git.hungrycats.org Git - linux/commitdiff
Merge mandrakesoft.com:/home/jgarzik/vanilla/linus-2.5
authorJeff Garzik <jgarzik@mandrakesoft.com>
Wed, 3 Apr 2002 12:12:54 +0000 (07:12 -0500)
committerJeff Garzik <jgarzik@mandrakesoft.com>
Wed, 3 Apr 2002 12:12:54 +0000 (07:12 -0500)
into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5


Trivial merge