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)
commitd1a667892658259aab52d9968571abd9efbc59a1
tree470101ab379d375bfd635ecec27ecd59441ac460
parentd269a69fbbbb7ddd2081af7a768feac754b8357a
parent1cb5821f444cadbe94453282f9f4767cf8744a8e
Merge branch 'e1000-7.0.38-k2-fixes' of git://63.64.152.142/~ahkok/git/netdev-2.6