From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Wed, 29 Apr 2015 10:12:18 +0000 (+0300)
Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
X-Git-Tag: v4.2-rc1~130^2~230^2~33^2~42
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ac1c8d5ea14dcf7cbfab97a9221cc80ee850a7b5;p=karo-tx-linux.git

Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
---

ac1c8d5ea14dcf7cbfab97a9221cc80ee850a7b5