David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-30 00:54:02 -04:00
..
alx.h	net: alx: Work around the DMA RX overflow issue	2016-06-14 15:30:50 -04:00
ethtool.c	alx: add stats to ethtool	2014-01-11 20:52:59 -08:00
hw.c	ethernet/atheros/alx: sanitize buffer sizing and padding	2016-01-06 15:05:25 -05:00
hw.h	ethernet/atheros/alx: sanitize buffer sizing and padding	2016-01-06 15:05:25 -05:00
main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-30 00:54:02 -04:00
Makefile
reg.h	Add Killer E2500 device ID in alx driver.	2016-08-29 00:23:50 -04:00