Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:42:07 +0000 (00:42 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:42:07 +0000 (00:42 -0400)
commit8d8b03297c96811501e3821edd4602b315458030
tree241e690a9b7957d48b6069940871f37aa9c7df5a
parentc67eebd67400c4c2ae1389317f1de0cbb3b7a1ca
parent357eb4cf75fdb9dbe46b64d50f3670de6a45dc91
Merge branch 'upstream-fixes' into upstream
drivers/net/pcnet32.c