From: Jeff Garzik Date: Fri, 18 Nov 2005 18:58:20 +0000 (-0500) Subject: Merge branch 'linville-e1000' of git://git.tuxdriver.com/git/netdev-jwl X-Git-Tag: v2.6.16-rc1~474^2~22^2~7^2~21^2~5 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e1d7a2de6c4249072dd886c129410e11e637ceff;p=users%2Fjedix%2Flinux-maple.git Merge branch 'linville-e1000' of git://git.tuxdriver.com/git/netdev-jwl --- e1d7a2de6c4249072dd886c129410e11e637ceff