]> git.hungrycats.org Git - linux/commitdiff
Merge pobox.com:/spare/repo/netdev-2.6/sis900
authorJeff Garzik <jgarzik@pobox.com>
Wed, 14 Jul 2004 10:33:02 +0000 (06:33 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 14 Jul 2004 10:33:02 +0000 (06:33 -0400)
into pobox.com:/spare/repo/net-drivers-2.6


Trivial merge