Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...
Jeff Garzik [Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)]
1  2 
drivers/net/e100.c
drivers/net/e1000/e1000_hw.c
drivers/net/e1000/e1000_main.c
drivers/net/ixgb/ixgb_main.c

Simple merge
Simple merge
Simple merge
Simple merge