From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 4 Jun 2005 21:05:05 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch orinoco-hch
X-Git-Tag: v2.6.13-rc1~90^2~583^2~59^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d8e11dcc29f4983bec67506d77728a04082e92d;p=linux-2.6

Automatic merge of /spare/repo/netdev-2.6 branch orinoco-hch
---

4d8e11dcc29f4983bec67506d77728a04082e92d