Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Sat, 4 Mar 2006 17:07:07 +0000 (12:07 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 4 Mar 2006 17:07:07 +0000 (12:07 -0500)
1  2 
drivers/net/s2io.c

Simple merge