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)
commitd25992e0f297fd794eb0669d51b3f5e6a0d7e995
treef78b57ed6a99a5c2f8470ab5c9443a1fa58dedad
parentcaff8cde319524cb8622bb213b46b7a4ad8fd141
parent96a08edbef42503e02bdf4f9235b27462262dad9
Merge mandrakesoft.com:/home/jgarzik/vanilla/linus-2.5
into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5