diff options
author | 2013-02-01 14:50:16 -0500 | |
---|---|---|
committer | 2013-02-01 14:50:16 -0500 | |
commit | 9165bf273e862c993f36aff0c149259faa72540d (patch) | |
tree | 989f14b7cee32d55f28b87c3610ffd41cefc8825 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | tcp: detect SYN/data drop when F-RTO is disabled (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (diff) | |
download | linux-dev-9165bf273e862c993f36aff0c149259faa72540d.tar.xz linux-dev-9165bf273e862c993f36aff0c149259faa72540d.zip |
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>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions