From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 28 Jun 2005 04:46:58 +0000 (-0400)
Subject: Merge /spare/repo/netdev-2.6 branch 'ieee80211'
X-Git-Tag: v2.6.14-rc1~1017^2~42
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d011e151bc5d1a581bf35b492a4fde44d30382b9;p=users%2Fjedix%2Flinux-maple.git

Merge /spare/repo/netdev-2.6 branch 'ieee80211'
---

d011e151bc5d1a581bf35b492a4fde44d30382b9