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)
commit38fe44e61a894f1c7b3e60b0614030271070ea53
tree0373a623ed428516e02b383e078832402d1fcd7e
parent7d072b404c5d8f1e0b62b6bc488dfeaa61bd2d8d
parentf115fdfd61bd627e99d636bb61a3d3ff93397048
Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git./linux/kernel/git/iwlwifi/iwlwifi-fixes

* fix OTP parsing 8260
* fix powersave handling for 8260