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

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/rs.c
Simple merge

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

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

diff --cc drivers/net/wireless/ralink/rt2x00/rt2x00.h
Simple merge