Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Thu, 28 May 2015 13:28:03 +0000 (16:28 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 28 May 2015 13:28:03 +0000 (16:28 +0300)
* fix OTP parsing 8260
* fix powersave handling for 8260


Trivial merge