David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-26 23:42:21 -05:00
..
ehea	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-15 10:54:36 -05:00
emac	ethernet/ibm: use core min/max MTU checking	2016-10-18 11:34:21 -04:00
ibmveth.c	ethernet: fix min/max MTU typos	2016-10-27 16:18:50 -04:00
ibmveth.h	ibmveth: add support for TSO6	2015-07-15 21:34:56 -07:00
ibmvnic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -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