]> git.hungrycats.org Git - linux/commitdiff
Merge hostme.bitkeeper.com:/ua/repos/g/gkernel/linus-2.5
authorJeff Garzik <gkernel.adm@hostme.bitkeeper.com>
Wed, 13 Feb 2002 02:01:25 +0000 (18:01 -0800)
committerJeff Garzik <gkernel.adm@hostme.bitkeeper.com>
Wed, 13 Feb 2002 02:01:25 +0000 (18:01 -0800)
into hostme.bitkeeper.com:/ua/repos/g/gkernel/net-drivers-2.5

1  2 
drivers/net/8139too.c

Simple merge