From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 28 May 2005 02:02:58 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
X-Git-Tag: v2.6.14-rc1~1017^2~48
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cd15a9daf826115356f9403494c76e5aafa7793;p=linux-2.6

Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
---

6cd15a9daf826115356f9403494c76e5aafa7793