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)
* 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


Trivial merge