David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-01-28 10:33:06 -05:00
..
Kconfig
Makefile
mtk_eth_soc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
mtk_eth_soc.h	net: ethernet: mediatek: get hw lro capability by the chip id instead of by the dtsi	2016-10-06 21:08:08 -04:00