Merge branch 'upstream' into upstream-jgarzik

Conflicts:

	net/ieee80211/softmac/ieee80211softmac_module.c
	net/ieee80211/softmac/ieee80211softmac_wx.c

diff --cc drivers/net/wireless/airo.c
Simple merge

diff --cc drivers/net/wireless/bcm43xx/bcm43xx.h
Simple merge

diff --cc drivers/net/wireless/bcm43xx/bcm43xx_main.c
Simple merge

diff --cc drivers/net/wireless/bcm43xx/bcm43xx_radio.c
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_chip.c
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_module.c
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_wx.c
Simple merge