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.h	alx: switch to per queue data structures	2016-11-15 22:46:30 -05:00
ethtool.c	net: alx: use new api ethtool_{get|set}_link_ksettings	2016-11-14 13:37:42 -05:00
hw.c	alx: add msi-x support	2016-09-09 20:51:21 -07:00
hw.h	ethernet/atheros: use core min/max MTU checking	2016-10-18 11:34:18 -04:00
main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
Makefile	Makefile: drop -D__CHECK_ENDIAN__ from cflags	2016-12-16 00:13:43 +02:00
reg.h	Add Killer E2500 device ID in alx driver.	2016-08-29 00:23:50 -04:00