Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...
authorJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)
commit699a71238856b19091503c671bac8abb1e3f9a3a
treedb0e6db06961db05c35f3df61e7f14b845b7cd29
parent85a7ea1b0a3263f3ad423b789a841d03c9acbb65
parent891b11f619dcfe045015394fa89041f02dac9428
Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp
drivers/net/e100.c
drivers/net/e1000/e1000_hw.c
drivers/net/e1000/e1000_main.c
drivers/net/ixgb/ixgb_main.c