Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:22:43 +0000 (17:22 -0700)]
1  2 
drivers/net/s2io.c

Simple merge