Merge remote-tracking branch 'wireless-next/master'

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/pcie/rx.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

diff --cc net/bluetooth/hci_core.c
Simple merge

diff --cc net/bluetooth/mgmt.c
Simple merge

diff --cc net/bluetooth/smp.c
Simple merge

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

diff --cc net/mac80211/ieee80211_i.h
Simple merge

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

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

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

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

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

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