Merge /spare/repo/netdev-2.6 branch 'ieee80211'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 13 Jul 2005 23:11:44 +0000 (19:11 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 13 Jul 2005 23:11:44 +0000 (19:11 -0400)

Trivial merge