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)

Trivial merge