Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...

author Jeff Garzik <jeff@garzik.org>

Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)

committer Jeff Garzik <jeff@garzik.org>

Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)
author Jeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)
committer Jeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)
diff --cc drivers/net/e100.c
Simple merge
diff --cc drivers/net/e1000/e1000_hw.c
Simple merge
diff --cc drivers/net/e1000/e1000_main.c
Simple merge
diff --cc drivers/net/ixgb/ixgb_main.c
Simple merge
author	Jeff Garzik <jeff@garzik.org>
	Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)
committer	Jeff Garzik <jeff@garzik.org>
	Thu, 24 Aug 2006 04:45:36 +0000 (00:45 -0400)
		1	2
drivers/net/e100.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000/e1000_hw.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000/e1000_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgb/ixgb_main.c	patch \|	diff1 \|	diff2 \|	blob \| history