Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:56:17 +0000 (15:56 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:56:17 +0000 (15:56 -0400)
commitcac925a4aab1b7233d3beb591f53498816058a08
treea800537068aa05fd426ff44b8efd52d66e6d2051
parentbcd618e4eac6fbf82de05d23c15ecb694c62b8af
parent6224e01dccf2543a8f8b4d825baf1510c79c2878
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp
drivers/net/e1000/e1000_main.c