Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Tue, 6 Jan 2015 17:36:11 +0000 (19:36 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 6 Jan 2015 17:36:11 +0000 (19:36 +0200)
commit64bb1b944b554a751b518b09c3d596f6b6c0ce31
tree6ec6524439780f128fee34f0755d6e711f7fd57b
parentdd9553988879a3ff71a86323b88409e7631c4e5d
parent834437dab96c751bb013aaac86b19974f6cb444e
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git./linux/kernel/git/iwlwifi/iwlwifi-next

* more work on d0i3 power state
* enhancements to the firmware debugging infrastructure
* support for 2 concurrent channel contexts
* fixes / cleanups in the rate control
* general cleanups
drivers/net/wireless/iwlwifi/iwl-drv.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/pcie/trans.c