Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 10 Aug 2006 12:31:03 +0000 (08:31 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 10 Aug 2006 12:31:03 +0000 (08:31 -0400)
1  2 
drivers/net/sky2.c

Simple merge