David S. Miller 6b0a7f84ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-17 11:26:25 -07:00
..
ehea	ehea: remove set but not used variables 'epa' and 'cq_handle_ref'	2019-04-04 17:36:23 -07:00
emac	net: emac: remove IBM_EMAC_RX_SKB_HEADROOM	2019-02-06 19:50:41 -08:00
ibmveth.c	ibmveth: Make array ibmveth_stats static	2019-03-19 14:10:09 -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	2019-04-17 11:26:25 -07:00
ibmvnic.h	ibmvnic: Report actual backing device speed and duplex values	2019-03-19 14:07:18 -07: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