From: Emmanuel Grumbach Date: Wed, 29 Oct 2014 10:48:37 +0000 (+0200) Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next X-Git-Tag: firefly_0821_release~176^2~2717^2~28^2~17^2~128 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e7322f32881589cc47709b65713455aa4621e22e;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next --- e7322f32881589cc47709b65713455aa4621e22e