Merge branch 'wireless'
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 Feb 2013 20:46:04 +0000 (15:46 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Feb 2013 20:46:04 +0000 (15:46 -0500)
commit2bedc2e65bf58676afc4b380617327e018a97270
tree33d0526e5632b137a3d3d9134acb40cc06facaf6
parentea5cdccc46d392b73d941c723630d37094e8e8ea
parent6d6436fbcbc43febe2481d3488f3bb5271ec2eb0
Merge branch 'wireless'

John W. Linville says:

====================
This is a batch of fixes intended for the 3.9 stream...

Avinash Patil gives us a mwifiex fix to prevent a system freeze when
that driver is unloaded.

Daniel Drake brings a patch to avoid dropping the carrier flag across a
suspend.  This prevents improper packet drops.

Wei Yongjun delivers a brcmfmac for a lock leak on an error path.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>