diff options
| author | David S. Miller <[email protected]> | 2017-06-15 15:31:37 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2017-06-15 15:59:32 +0000 |
| commit | 0ddead90b223faae475f3296a50bf574b7f7c69a (patch) | |
| tree | e729c7fcdc7e3697f7fae2f3028ed0d11931c425 /net/ipv4/tcp_ulp.c | |
| parent | rxrpc: Cache the congestion window setting (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-0ddead90b223faae475f3296a50bf574b7f7c69a.tar.gz kernel-0ddead90b223faae475f3296a50bf574b7f7c69a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_ulp.c')
0 files changed, 0 insertions, 0 deletions