Merge branch 'e1000-7.0.38-k2-fixes' of git://63.64.152.142/~ahkok/git/netdev-2.6
authorJeff Garzik <jeff@garzik.org>
Thu, 20 Apr 2006 21:30:41 +0000 (17:30 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 20 Apr 2006 21:30:41 +0000 (17:30 -0400)

Trivial merge