diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-17 20:26:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-17 20:26:25 +0200 |
| commit | 6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b (patch) | |
| tree | 0a7976054052e793da782c2b7ec34eccfbf66449 /net/ipv4/tcp.c | |
| parent | Merge branch 's390-next' (diff) | |
| parent | Merge tag 'for-linus-5.1-2' of git://github.com/cminyard/linux-ipmi (diff) | |
| download | linux-6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b.tar.xz linux-6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict resolution of af_smc.c from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
0 files changed, 0 insertions, 0 deletions