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

Trivial merge