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
..
alx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
atl1c	net: atheros: atl1c: use new api ethtool_{get|set}_link_ksettings	2016-11-14 13:37:42 -05:00
atl1e	net: atheros: atl1e: use new api ethtool_{get|set}_link_ksettings	2016-11-13 13:53:01 -05:00
atlx	net: atheros: atl2: use new api ethtool_{get|set}_link_ksettings	2016-11-14 13:37:43 -05:00
Kconfig	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile