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

Kalle Valo says:

====================
Major changes:

wl12xx

* add device tree support for SPI

mwifiex

* add debugfs file to read chip information
* add MSIx support for newer pcie chipsets (8997 onwards)
* add schedule scan support
* add WoWLAN net-detect support
* firmware dump support for w8997 chipset

iwlwifi

* continue the work on multiple Rx queues
* add support for beacon storing used in low power states
* use the regular firmware image of WoWLAN
* fix 8000 devices for Big Endian machines
* more firmware debug hooks
* add support for P2P Client snoozing
* make the beacon filtering for AP mode configurable
* fix transmit queues overflow with LSO

libertas

* add support for setting power save via cfg80211
====================

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

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