Merge tag 'wireless-drivers-next-for-davem-2016-04-11' of git://git.kernel.org/pub...

Kalle Valo says:

====================
wireless-drivers patches for 4.7

Major changes:

iwlwifi

* support for Link Quality measurement
* more work 9000 devices and MSIx
* continuation of the Dynamic Queue Allocation work
* make the paging less memory hungry
* 9000 new Rx path
* removal of IWLWIFI_UAPSD Kconfig option

ath10k

* implement push-pull tx model using mac80211 software queuing support
* enable scan in AP mode (NL80211_FEATURE_AP_SCAN)

wil6210

* add basic PBSS (Personal Basic Service Set) support
* add initial P2P support
* add oob_mode module parameter
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/wireless/ath/ath10k/htt_rx.c
Simple merge

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

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