From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 28 May 2005 02:57:33 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
X-Git-Tag: v2.6.14-rc1~997^2~47
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=4c925f452cfd16c690209e96821ee094e09a2404;hp=-c;p=powerpc.git

Merge ... /spare/repo/netdev-2.6 branch we18-ieee80211
---

4c925f452cfd16c690209e96821ee094e09a2404