]> git.hungrycats.org Git - linux/commitdiff
Merge http://typhoon.bkbits.net/typhoon-2.5
authorJeff Garzik <jgarzik@redhat.com>
Thu, 13 Feb 2003 22:03:43 +0000 (17:03 -0500)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 13 Feb 2003 22:03:43 +0000 (17:03 -0500)
into redhat.com:/garz/repo/net-drivers-2.5

1  2 
drivers/net/Kconfig

Simple merge