Merge branch 'e1000-7.0.38-k4' of git://lost.foo-projects.org/~ahkok/git/netdev-2...
authorJeff Garzik <jeff@garzik.org>
Tue, 23 May 2006 21:21:33 +0000 (17:21 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 23 May 2006 21:21:33 +0000 (17:21 -0400)
commitbdad69b23c86e41262b85d8affc9a3b34ee2ee74
tree1998fc609e8c614247db8b617e194a746e2bcc03
parent9528454f9c02fb9c359c4c42c69eed4d47407e39
parent440c052d6f717495806fe2c65f3f5677c92397c7
Merge branch 'e1000-7.0.38-k4' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream