Merge /spare/repo/netdev-2.6/ branch 'orinoco'
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Mon, 27 Jun 2005 04:27:47 +0000 (00:27 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 27 Jun 2005 04:27:47 +0000 (00:27 -0400)

Trivial merge