Merge tag 'iwlwifi-next-for-kalle-2015-04-02' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Tue, 7 Apr 2015 16:55:57 +0000 (19:55 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 7 Apr 2015 16:55:57 +0000 (19:55 +0300)
commit6dcaac59d08b77d5730f2ae824bca1c0bf8130dc
tree5d01321c7ceedb7a9a294ac20dadee372b301d0b
parent7abccdba25be45630eede85053496f1f48d36ec8
parent31755207afc5d5a30e3eea9e4f2a518fc5b680c1
Merge tag 'iwlwifi-next-for-kalle-2015-04-02' of https://git./linux/kernel/git/iwlwifi/iwlwifi-next

* some more work on LAR
* fixes for UMAC scan
* more work on debugging framework
* more work for 8000 devices
* cleanups and small bugfixes
drivers/net/wireless/iwlwifi/iwl-drv.c
drivers/net/wireless/iwlwifi/mvm/rs.c
drivers/net/wireless/iwlwifi/mvm/tx.c