David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-01-28 10:33:06 -05: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: use new api ethtool_{get|set}_link_ksettings	2017-01-09 12:09:09 -05:00
ibmveth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
ibmveth.h	ibmveth: set correct gso_size and gso_type	2016-12-09 22:47:22 -05:00
ibmvnic.c	net: ibm: ibmvnic: use new api ethtool_{get|set}_link_ksettings	2017-01-09 12:09:10 -05:00
ibmvnic.h	ibmvnic: Fix releasing of sub-CRQ IRQs in interrupt context	2016-10-29 17:18:46 -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