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)
* some more work on LAR
* fixes for UMAC scan
* more work on debugging framework
* more work for 8000 devices
* cleanups and small bugfixes

1  2 
drivers/net/wireless/iwlwifi/iwl-drv.c
drivers/net/wireless/iwlwifi/mvm/rs.c
drivers/net/wireless/iwlwifi/mvm/tx.c

Simple merge
Simple merge