aboutsummaryrefslogtreecommitdiff
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-05-18 11:18:20 -0400
committerDavid S. Miller <davem@davemloft.net>2017-05-18 11:18:20 -0400
commit10b3203eb3590b1cd467821a2e001fd43d8284fd (patch)
treea8ae8f4194e9a1368af2fa72200769a3a48a5b73 /net/ipv4/tcp_input.c
parentd5d6add01e952228576c1f048b449198a3e03ba8 (diff)
parentd14ccea0e71a55ad02bf4e1cb378bbece282d5cf (diff)
Merge tag 'linux-can-next-for-4.13-20170518' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says: ==================== pull-request: can-next 2017-05-18 this is a pull request of 4 patches for net-next/master. All 4 patches are by Quentin Schulz, they add deep deep Suspend/Resume support to the m_can driver. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
0 files changed, 0 insertions, 0 deletions