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

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

Fri, 14 Oct 2016 14:00:27 +0000 (10:00 -0400)

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

Fri, 14 Oct 2016 14:00:27 +0000 (10:00 -0400)
author David S. Miller <davem@davemloft.net>
Fri, 14 Oct 2016 14:00:27 +0000 (10:00 -0400)
committer David S. Miller <davem@davemloft.net>
Fri, 14 Oct 2016 14:00:27 +0000 (10:00 -0400)
diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge
diff --cc drivers/net/ethernet/ti/tlan.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Fri, 14 Oct 2016 14:00:27 +0000 (10:00 -0400)
committer	David S. Miller <davem@davemloft.net>
	Fri, 14 Oct 2016 14:00:27 +0000 (10:00 -0400)
		1	2
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/tlan.c	patch \|	diff1 \|	diff2 \|	blob \| history