From: Kalle Valo <kvalo@codeaurora.org>
Date: Thu, 28 May 2015 13:28:03 +0000 (+0300)
Subject: Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v4.1~60^2~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38fe44e61a894f1c7b3e60b0614030271070ea53;p=platform%2Fkernel%2Flinux-amlogic.git

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

38fe44e61a894f1c7b3e60b0614030271070ea53