Merge tag 'iwlwifi-for-kalle-2014-03-22' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Mon, 23 Mar 2015 04:43:43 +0000 (06:43 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 23 Mar 2015 04:43:43 +0000 (06:43 +0200)
* avoid panic with lots of IBSS stations
* Fix dvm's behavior after suspend resume
* Allow to keep connection after CSA failure
* Remove a noisy by harmless WARN_ON
* New device IDs


Trivial merge