From: Emmanuel Grumbach Date: Wed, 29 Apr 2015 10:12:18 +0000 (+0300) Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next X-Git-Tag: firefly_0821_release~176^2~1587^2~139^2^2~96 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ac1c8d5ea14dcf7cbfab97a9221cc80ee850a7b5;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next --- ac1c8d5ea14dcf7cbfab97a9221cc80ee850a7b5