Merge branch 'upstream-fixes' into upstream
Jeff Garzik [Thu, 24 Aug 2006 04:42:07 +0000 (00:42 -0400)]
1  2 
drivers/net/pcnet32.c

Simple merge