Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 03:19:57 +0000 (22:19 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 03:19:57 +0000 (22:19 -0500)
commit97309d1a0bbdcb0813ea08574b4473d8e5416012
tree0dcbcf5aa5146147e0ac1d0c4b73b868a67d333b
parentb4ea75b649417606fd6b38710a2962ec9770e772
parentefd51b5c6798d103e3aa683464aebb2019b62119
Merge branch 'upstream-fixes'
drivers/net/s2io.c