Merge branch 'upstream-fixes' of...

drivers/net/wireless/Kconfig

drivers/net/wireless/airo.c

drivers/net/wireless/atmel.c

drivers/net/wireless/bcm43xx/Kconfig

drivers/net/wireless/bcm43xx/bcm43xx.h

drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c

drivers/net/wireless/bcm43xx/bcm43xx_dma.c

drivers/net/wireless/bcm43xx/bcm43xx_main.c

drivers/net/wireless/bcm43xx/bcm43xx_phy.c

drivers/net/wireless/bcm43xx/bcm43xx_power.c

drivers/net/wireless/bcm43xx/bcm43xx_power.h

drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c

drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h

drivers/net/wireless/bcm43xx/bcm43xx_wx.c

drivers/net/wireless/orinoco.c

include/net/ieee80211softmac.h

net/core/dev.c

net/core/wireless.c

net/ieee80211/softmac/Kconfig

net/ieee80211/softmac/ieee80211softmac_assoc.c