David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
ehea	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-03 21:00:17 -07:00
emac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-09 21:43:31 -08:00
Kconfig	Driver for IBM System i/p VNIC protocol	2015-12-28 00:12:13 -05:00
Makefile	Driver for IBM System i/p VNIC protocol	2015-12-28 00:12:13 -05:00
ibmveth.c	net: ethernet: remove redundant include	2018-09-18 20:07:27 -07:00
ibmveth.h	ibmveth: Support to enable LSO/CSO for Trunk VEA.	2017-05-21 13:29:01 -04:00
ibmvnic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
ibmvnic.h	ibmvnic: Convert reset work item mutex to spin lock	2018-12-10 17:34:25 -08:00