From: David S. Miller Date: Fri, 1 Feb 2013 19:50:16 +0000 (-0500) Subject: Merge branch 'wireless' X-Git-Tag: v3.8-rc7~2^2~21 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=9165bf273e862c993f36aff0c149259faa72540d;p=cascardo%2Flinux.git Merge branch 'wireless' John W. Linville says: ==================== This is a small batch of fixes intended for the 3.8 stream... There are two pulls from Johannes. Regarding mac80211, Johannes says: "One fix from Dan for a possible memory overrun." Regarding iwlwifi, Johannes says: "I have one fix from Emmanuel reverting a previous fix that caused more trouble than it's worth." Along with those: Arend van Spriel fixes a fatal error in brcsmac related to tx status processing. Bing Zhao corrects a problem where mwifiex would fail to complete a scan in the event of an IE processing error. Larry Finger fixes a thinko in rtlwifi in which the wrong skb variable was being used in some cases. Rafał Miłecki fixes a thinko in an ID check in the bcma flash code. ==================== Signed-off-by: David S. Miller --- 9165bf273e862c993f36aff0c149259faa72540d