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.14-rc2~49^2~36^2~53^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4d8e11dcc29f4983bec67506d77728a04082e92d;p=users%2Fjedix%2Flinux-maple.git

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

4d8e11dcc29f4983bec67506d77728a04082e92d