]> git.hungrycats.org Git - linux/commitdiff
Merge pobox.com:/garz/repo/netdev-2.6/forcedeth
authorJeff Garzik <jgarzik@pobox.com>
Thu, 21 Oct 2004 15:45:19 +0000 (11:45 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 21 Oct 2004 15:45:19 +0000 (11:45 -0400)
into pobox.com:/garz/repo/net-drivers-2.6

1  2 
drivers/net/forcedeth.c

Simple merge