David S. Miller 16ae1f2236 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/genet/bcmmii.c drivers/net/hyperv/netvsc.c kernel/bpf/hashtab.c Almost entirely overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-03-23 16:41:27 -07:00
..
ehea	net: ibm: ehea: use new api ethtool_{get|set}_link_ksettings	2017-01-09 12:09:09 -05:00
emac	net: ibm: emac: fix regression caused by emac_dt_phy_probe()	2017-03-08 22:15:46 -08:00
ibmveth.c	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
ibmveth.h	ibmveth: set correct gso_size and gso_type	2016-12-09 22:47:22 -05:00
ibmvnic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-03-23 16:41:27 -07:00
ibmvnic.h	ibmvnic: Correct ibmvnic handling of device open/close	2017-03-21 17:46:14 -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