tree 989f14b7cee32d55f28b87c3610ffd41cefc8825
parent 66555e92fb7a619188c02cceae4bbc414f15f96d
parent ed6882ac40552034ae6bde3e540b84c832dc8491
author David S. Miller <davem@davemloft.net> 1359748216 -0500
committer David S. Miller <davem@davemloft.net> 1359748216 -0500

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 <davem@davemloft.net>