Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Tue, 28 Jun 2005 02:03:52 +0000 (22:03 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 28 Jun 2005 02:03:52 +0000 (22:03 -0400)

Trivial merge