Merge branch 'upstream-jgarzik' of...

drivers/net/wireless/airo.c

drivers/net/wireless/bcm43xx/bcm43xx.h

drivers/net/wireless/bcm43xx/bcm43xx_ilt.c

drivers/net/wireless/bcm43xx/bcm43xx_ilt.h

drivers/net/wireless/bcm43xx/bcm43xx_main.c

drivers/net/wireless/bcm43xx/bcm43xx_phy.c

drivers/net/wireless/bcm43xx/bcm43xx_radio.c

drivers/net/wireless/bcm43xx/bcm43xx_xmit.h

drivers/net/wireless/hostap/hostap.h

drivers/net/wireless/ipw2100.c

drivers/net/wireless/prism54/isl_ioctl.c

drivers/net/wireless/prism54/oid_mgt.c

drivers/net/wireless/wavelan.c

drivers/net/wireless/wavelan.p.h

drivers/net/wireless/zd1211rw/zd_chip.c

include/linux/wireless.h

net/ieee80211/softmac/ieee80211softmac_module.c

net/ieee80211/softmac/ieee80211softmac_wx.c