Merge tag 'iwlwifi-for-kalle-2016-06-10' of git://git.kernel.org/pub/scm/linux/kernel...
authorKalle Valo <kvalo@codeaurora.org>
Tue, 14 Jun 2016 14:07:38 +0000 (17:07 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 14 Jun 2016 14:07:38 +0000 (17:07 +0300)
commitbba42c7877d3efce86ca331ad1a7e37046627c72
tree5a2e65ef15fb09ee2426c4f0dc96aecf2cde25a9
parent182fd9eecb287e696c82b30d06c6150d80a49c5b
parent280a3efa82fccc9532c968a77e5162cb9f0af497
Merge tag 'iwlwifi-for-kalle-2016-06-10' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes

* fix the scan timeout for long scans
* fix an RCU splat caused when updating the TKIP key
* fix a potential NULL-derefence introduced recently
* fix a IGTK key bug that has existed since the MVM driver was introduced
* fix some fw capabilities checks that got accidentally inverted