diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-17 22:05:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-17 22:05:50 +0200 |
| commit | df709a18cae475de38ddaff63584692d50267b92 (patch) | |
| tree | 94db1a56c2427baaf1d2d92364718f69f77d95c7 /net/ipv4/tcp_output.c | |
| parent | net: qmi_wwan: Olivetti Olicard 200 support (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-df709a18cae475de38ddaff63584692d50267b92.tar.xz linux-df709a18cae475de38ddaff63584692d50267b92.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
Please pull this batch of fixes intended for the 3.12 stream!
For the mac80211 bits, Johannes says:
"Jouni fixes a remain-on-channel vs. scan bug, and Felix fixes client TX
probing on VLANs."
And also:
"This time I have two fixes from Emmanuel for RF-kill issues, and fixed
two issues reported by Evan Huus and Thomas Lindroth respectively."
On top of those...
Avinash Patil adds a couple of mwifiex fixes to properly inform cfg80211
about some different types of disconnects, avoiding WARNINGs.
Mark Cave-Ayland corrects a pointer arithmetic problem in rtlwifi,
avoiding incorrect automatic gain calculations.
Solomon Peachy sends a cw1200 fix for locking around calls to
cw1200_irq_handler, addressing "lost interrupt" problems.
Please let me know if there are problems!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
0 files changed, 0 insertions, 0 deletions