]> git.hungrycats.org Git - linux/commitdiff
Merge redhat.com:/spare/repo/netdev-2.6/8139too
authorJeff Garzik <jgarzik@redhat.com>
Wed, 4 Feb 2004 15:41:32 +0000 (10:41 -0500)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 4 Feb 2004 15:41:32 +0000 (10:41 -0500)
into redhat.com:/spare/repo/net-drivers-2.5

1  2 
drivers/net/Kconfig

Simple merge