Merge tag 'iwlwifi-for-kalle-2015-01-05' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Mon, 5 Jan 2015 10:07:04 +0000 (12:07 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 5 Jan 2015 10:07:04 +0000 (12:07 +0200)
* fix for 7265D NVM check
* fixes for scan: fix long scanning times and network
discovery
* new firmware API for iwlmvm supported devices
* fixes in rate control


Trivial merge