diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-06 23:51:14 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-06 23:51:14 +0400 |
| commit | b6ec447df935669d670e82bd66d9d161418efdfa (patch) | |
| tree | 0a4c792efd730a59adc79d0d2476e0a4b3aa2f2e /crypto/algif_hash.c | |
| parent | bf414b369f158bb527f9f29174ada815f961b44c (diff) | |
| parent | b3b66ae4c8aff0636521034d824b8953dc617335 (diff) | |
| download | linux-b6ec447df935669d670e82bd66d9d161418efdfa.tar.xz | |
Merge branch 'wireless'
John W. Linville says:
====================
Please consider this pull request for the 3.8 stream...
Included is a bluetooth pull. Gustavo says:
"Two simple fixes for 3.8. One of the patches fixes a situation
where the connection wasn't terminated if a timeout ocurrs for LE
an SCO connections. The other fixes prevent NULL dereference in the
SMP code, it is a security fix as well."
Along with those...
Hauke Mehrtens provides a couple of ssb and bcma bus fixes that
prevent oopses when unloading those modules.
Larry Finger provides and rtlwifi fix to avoid a "scheduling while
atomic" bug.
Last but certainly not least, Arend van Spriel bring a brcmsmac fix that
reworks the mac80211 .flush() callback in order to avoid the dreaded
brcms_c_wait_for_tx_completion warnings. This one looks a little
large, but I think it is safe and isolated to brcmsmac in any case.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/algif_hash.c')
0 files changed, 0 insertions, 0 deletions