Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Mon, 27 Jun 2005 03:42:30 +0000 (23:42 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 27 Jun 2005 03:42:30 +0000 (23:42 -0400)

Trivial merge