]> git.hungrycats.org Git - linux/commitdiff
Merge mandrakesoft.com:/home/jgarzik/vanilla/linus-2.5
authorJeff Garzik <jgarzik@mandrakesoft.com>
Fri, 31 May 2002 10:37:24 +0000 (06:37 -0400)
committerJeff Garzik <jgarzik@mandrakesoft.com>
Fri, 31 May 2002 10:37:24 +0000 (06:37 -0400)
into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5


Trivial merge