aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-02-25 15:46:04 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-25 15:46:04 -0500
commit2bedc2e65bf58676afc4b380617327e018a97270 (patch)
tree33d0526e5632b137a3d3d9134acb40cc06facaf6 /net
parentnet/pasemi: Fix missing coding style (diff)
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (diff)
downloadlinux-dev-2bedc2e65bf58676afc4b380617327e018a97270.tar.xz
linux-dev-2bedc2e65bf58676afc4b380617327e018a97270.zip
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>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions