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
..
dwc_eth_qos.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -05:00
Kconfig	ethernet: synopsys: SYNOPSYS_DWC_ETH_QOS should depend on HAS_DMA	2015-09-06 19:48:53 -07:00
Makefile