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)
commit716b43303df605510399d6da0d0dd4e2ea376e7c
tree57412aaf516b7a10b4b81064aeda318514fec168
parent5696c1944a33b4434a9a1ebb6383b906afd43a10
parentc7b645f934e52a54af58142d91fb51f881f8ce26
Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
drivers/net/wireless/orinoco.c
drivers/usb/net/zd1201.c