Automatic merge of /spare/repo/netdev-2.6 branch pcnet32
author <jgarzik@pretzel.yyz.us> <>
Wed, 25 May 2005 17:57:25 +0000 (13:57 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 25 May 2005 17:57:25 +0000 (13:57 -0400)

Trivial merge