summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_metrics.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-04-26 15:57:59 +0100
committerMark Brown <broonie@kernel.org>2017-04-26 15:57:59 +0100
commit2536374352ab112e5ea2ef8ce0cfa0e9cfa63112 (patch)
treec2e3182767261ec430282c256e1841d07ec62665 /net/ipv4/tcp_metrics.c
parent42b1eadf4ead6e7d68f47cd985daa244823c96d3 (diff)
parente53800787a251d67e532fadf72886be0661aba12 (diff)
parent7ab2463550e2a3a5b97dfa82e5bf8038b986f007 (diff)
parentb42a33bd93fe0b2438511b1c7c00cfd47e17841b (diff)
parent1234e8398fe03267bf2e353e36825dbd0abc2fc6 (diff)
downloadlinux-2536374352ab112e5ea2ef8ce0cfa0e9cfa63112.tar.bz2
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm63xx', 'spi/topic/cadence' and 'spi/topic/davinci' into spi-next