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

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

diff --cc drivers/net/wireless/brcm80211/brcmfmac/p2p.c
Simple merge

diff --cc drivers/net/wireless/hostap/hostap_ioctl.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/libipw_rx.c
Simple merge

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

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

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

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