diff options
| author | 2019-06-22 08:59:24 -0400 | |
|---|---|---|
| committer | 2019-06-22 08:59:24 -0400 | |
| commit | 92ad6325cb891bb455487bfe90cc47d18aa6ec37 (patch) | |
| tree | 433a7ef938fae69789216043f67eff9f9c6b0c68 /include/linux/tcp.h | |
| parent | Merge branch 'PCI-let-pci_disable_link_state-propagate-errors' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | wireguard-linux-92ad6325cb891bb455487bfe90cc47d18aa6ec37.tar.xz wireguard-linux-92ad6325cb891bb455487bfe90cc47d18aa6ec37.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor SPDX change conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/tcp.h')
0 files changed, 0 insertions, 0 deletions
