From: Johannes Berg Date: Wed, 6 Mar 2013 15:33:12 +0000 (+0100) Subject: Merge remote-tracking branch 'mac80211/master' into HEAD X-Git-Tag: MMI-PSA29.97-13-9~14399^2~21^2^2~117^2~105 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c0f3a317f2f0e51ad2f8809c83b137958b385c7f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge remote-tracking branch 'mac80211/master' into HEAD There are a few things that would otherwise conflict. Signed-off-by: Johannes Berg --- c0f3a317f2f0e51ad2f8809c83b137958b385c7f