linux_dsm_epyc7002/drivers/net/ethernet/ibm
David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of easy overlapping changes in the confict
resolutions here.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-05-26 19:46:15 -04:00
..
ehea ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
emac Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-01-24 23:44:15 -05:00
ibmveth.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04: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-05-26 19:46:15 -04:00
ibmvnic.h ibmvnic: Introduce hard reset recovery 2018-05-24 22:19:26 -04: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