diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-08 14:17:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-08 14:17:39 -0700 |
| commit | b78370c021c9d52721c7f96fbb3e10f5b2f428d3 (patch) | |
| tree | 496f301588a92b4573967cf62dd01dd56aec1b7f /net/ipv4/tcp_input.c | |
| parent | 8063968af9e3b96da3b19992a7d580d8ce921562 (diff) | |
| parent | c6ac68a612783aab0aad62b8edd36791b251aadb (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
pull request: wireless-next 2014-06-06
Please accept this batch of fixes intended for the 3.16 stream.
For the bluetooth bits, Gustavo says:
"Here some more patches for 3.16. We know that Linus already opened the merge
window, but this is fix only pull request, and most of the patches here are
also tagged for stable."
Along with that, Andrea Merello provides a fix for the broken scanning
in the venerable at76c50x driver...
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
0 files changed, 0 insertions, 0 deletions