]> err.no Git - linux-2.6/commitdiff
Merge branch 'linville-e1000' of git://git.tuxdriver.com/git/netdev-jwl
authorJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 18:58:20 +0000 (13:58 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 18:58:20 +0000 (13:58 -0500)

Trivial merge