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

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

Fri, 21 Dec 2018 23:06:20 +0000 (15:06 -0800)

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

Fri, 21 Dec 2018 23:06:20 +0000 (15:06 -0800)
author David S. Miller <davem@davemloft.net>
Fri, 21 Dec 2018 23:06:20 +0000 (15:06 -0800)
committer David S. Miller <davem@davemloft.net>
Fri, 21 Dec 2018 23:06:20 +0000 (15:06 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/ethernet/mscc/ocelot.c
Simple merge
diff --cc net/core/skmsg.c
Simple merge
diff --cc net/tls/tls_sw.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Fri, 21 Dec 2018 23:06:20 +0000 (15:06 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 21 Dec 2018 23:06:20 +0000 (15:06 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mscc/ocelot.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/core/skmsg.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	patch \|	diff1 \|	diff2 \|	blob \| history