Merge mandrakesoft.com:/home/jgarzik/vanilla/linus-2.5
authorJeff Garzik <jgarzik@mandrakesoft.com>
Sat, 11 May 2002 00:36:55 +0000 (20:36 -0400)
committerJeff Garzik <jgarzik@mandrakesoft.com>
Sat, 11 May 2002 00:36:55 +0000 (20:36 -0400)
commitb446946d5e70c33d17cf9ecf50211a8edbc701ef
tree5c236ae34de4996e494e9377542f0c1dd9b442dc
parentfeeb46df8369b3f04e010cb1690e8e6b915611cd
parentfa44005c7639940d5205fe470f2bd88fb96a3ada
Merge mandrakesoft.com:/home/jgarzik/vanilla/linus-2.5
into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5