diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-25 21:46:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-25 21:46:04 +0100 |
| commit | 2bedc2e65bf58676afc4b380617327e018a97270 (patch) | |
| tree | 33d0526e5632b137a3d3d9134acb40cc06facaf6 /include/net/ipip.h | |
| parent | net/pasemi: Fix missing coding style (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-2bedc2e65bf58676afc4b380617327e018a97270.tar.xz linux-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 'include/net/ipip.h')
0 files changed, 0 insertions, 0 deletions