Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Fri, 6 May 2016 11:27:48 +0000 (14:27 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 6 May 2016 11:27:48 +0000 (14:27 +0300)
* fix P2P rates (and possibly other issues)


Trivial merge