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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-30 00:54:02 -04:00
atl1c	atl1c: remove private tx lock	2016-04-26 15:53:04 -04:00
atl1e	atle1: remove LLTX support and TX_UNLOCKED	2016-04-26 15:53:04 -04:00
atlx	atl2: Disable unimplemented scatter/gather feature	2016-04-21 15:12:23 -04:00
Kconfig	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile	alx: add a simple AR816x/AR817x device driver	2013-06-17 16:04:34 -07:00