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
..
Kconfig	marvell: mark mvneta and mvpp2 32-bit only	2016-11-22 10:08:40 -05:00
Makefile	net: mvneta: bm: add support for hardware buffer management	2016-03-14 12:19:46 -04:00
mv643xx_eth.c	net: mv643xx_eth: Utilize phy_ethtool_nway_reset	2016-11-15 16:33:35 -05:00
mvmdio.c	net: mvmdio: do not clk_disable_unprepare() NULL clock	2016-10-03 02:03:27 -04:00
mvneta_bm.c	net: mvneta: Fix lacking spinlock initialization	2016-05-25 12:35:08 -07:00
mvneta_bm.h	net: mvneta: use IS_ENABLED() instead of checking for built-in or module	2016-09-12 20:27:59 -07:00
mvneta.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -05:00
mvpp2.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -05:00
pxa168_eth.c	net: ethernet: marvell: pxa168_eth: Implement ethtool::nway_reset	2016-11-16 13:44:01 -05:00
skge.c	skge: Rename LED_OFF and LED_ON in marvel skge driver to avoid conflicts with leds namespace	2016-10-18 11:56:30 -04:00
skge.h	skge: Rename LED_OFF and LED_ON in marvel skge driver to avoid conflicts with leds namespace	2016-10-18 11:56:30 -04:00
sky2.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-22 13:27:16 -05:00
sky2.h	sky2: Receive Overflows not counted	2013-03-29 14:53:19 -04:00