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

MAINTAINERS

drivers/bcma/bcma_private.h

drivers/bcma/host_pci.c

drivers/bcma/main.c

drivers/net/wireless/ath/ath9k/ar9003_mac.c

drivers/net/wireless/ath/ath9k/mac.c

drivers/net/wireless/b43/main.c

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

drivers/net/wireless/ipw2x00/ipw2200.c

drivers/net/wireless/iwlwifi/iwl-scan.c

drivers/net/wireless/mwl8k.c

drivers/net/wireless/rt2x00/rt2800pci.c

include/linux/bcma/bcma.h

net/mac80211/cfg.c

net/mac80211/rx.c

net/mac80211/sta_info.c

net/mac80211/tx.c

net/mac80211/wpa.c

net/mac80211/wpa.h