Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

author David S. Miller <davem@davemloft.net>

Tue, 23 May 2017 03:32:48 +0000 (23:32 -0400)

committer David S. Miller <davem@davemloft.net>

Tue, 23 May 2017 03:32:48 +0000 (23:32 -0400)
author David S. Miller <davem@davemloft.net>
Tue, 23 May 2017 03:32:48 +0000 (23:32 -0400)
committer David S. Miller <davem@davemloft.net>
Tue, 23 May 2017 03:32:48 +0000 (23:32 -0400)
diff --cc net/bridge/br_stp_if.c
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Tue, 23 May 2017 03:32:48 +0000 (23:32 -0400)
committer	David S. Miller <davem@davemloft.net>
	Tue, 23 May 2017 03:32:48 +0000 (23:32 -0400)
		1	2
net/bridge/br_stp_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	patch \|	diff1 \|	diff2 \|	blob \| history