David S. Miller a06ee256e5 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-09-25 10:35:29 -07:00
..
ehea	net: ibm: remove redundant local variables 'act_nr_of_entries' and 'act_pages'	2018-09-19 21:26:40 -07:00
emac	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07: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	net: ibm: fix return type of ndo_start_xmit function	2018-09-18 20:03:37 -07:00
ibmvnic.h	ibmvnic: Remove code to request error information	2018-08-07 12:46:27 -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