diff options
| author | David S. Miller | 2017-06-15 17:31:37 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-06-15 17:59:32 +0200 |
| commit | 0ddead90b223faae475f3296a50bf574b7f7c69a (patch) | |
| tree | e729c7fcdc7e3697f7fae2f3028ed0d11931c425 /include/net/inet_connection_sock.h | |
| parent | rxrpc: Cache the congestion window setting (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-0ddead90b223faae475f3296a50bf574b7f7c69a.tar.gz kernel-qcow2-linux-0ddead90b223faae475f3296a50bf574b7f7c69a.tar.xz kernel-qcow2-linux-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 <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_connection_sock.h')
0 files changed, 0 insertions, 0 deletions