diff options
author | David S. Miller <davem@davemloft.net> | 2018-09-18 18:33:27 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-18 18:33:27 +0200 |
commit | e366fa435032db1ce1538a2c029714666985dd48 (patch) | |
tree | d08bab02ba212339e4cfc0f2e3666435dd795b90 /net/ipv4/tcp_vegas.h | |
parent | net: mdio: remove duplicated include from mdio_bus.c (diff) | |
parent | Merge gitolite.kernel.org:/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-e366fa435032db1ce1538a2c029714666985dd48.tar.xz linux-e366fa435032db1ce1538a2c029714666985dd48.zip |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Two new tls tests added in parallel in both net and net-next.
Used Stephen Rothwell's linux-next resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_vegas.h')
0 files changed, 0 insertions, 0 deletions