Automatic merge of /spare/repo/netdev-2.6 branch r8169
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 21:06:57 +0000 (17:06 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 21:06:57 +0000 (17:06 -0400)

Trivial merge