Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/dvm/tx.c

diff --cc drivers/bcma/bcma_private.h
Simple merge

diff --cc drivers/bcma/driver_chipcommon_nflash.c
Simple merge

diff --cc drivers/bcma/driver_gpio.c
Simple merge

diff --cc drivers/bcma/main.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmsmac/main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/dvm/tx.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/scan.c
Simple merge

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

diff --cc drivers/net/wireless/rtlwifi/usb.c
Simple merge

diff --cc drivers/ssb/driver_gpio.c
Simple merge

diff --cc drivers/ssb/main.c
Simple merge

diff --cc drivers/ssb/ssb_private.h
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/wireless/scan.c
Simple merge