From: Johannes Berg Date: Wed, 6 Mar 2013 15:46:25 +0000 (+0100) Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD X-Git-Tag: firefly_0821_release~3680^2~478^2~21^2^2~17^2~84 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=41effc2a6c6548f1dc6b749f09c646d931c309a4;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD This is needed to resolve some conflicts that would otherwise happen between wireless-next and the code here. Signed-off-by: Johannes Berg --- 41effc2a6c6548f1dc6b749f09c646d931c309a4