David S. Miller 29fda25a2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-01 10:07:50 -07:00
..
cassini.c	net: sun: cassini: use new api ethtool_{get|set}_link_ksettings	2017-03-08 22:18:05 -08:00
cassini.h	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
Kconfig	sunvnet: make sunvnet common code dynamically loadable	2017-02-14 13:04:08 -05:00
ldmvsw.c	sunvnet: add support for IPv6 checksum offloads	2017-07-16 16:36:01 -07:00
Makefile	ldmvsw: Add ldmvsw.c driver code	2016-03-18 19:33:00 -04:00
niu.c	net: Convert to using %pOF instead of full_name	2017-07-24 13:41:48 -07:00
niu.h	cassini/niu/sun*: Move the Sun drivers	2011-08-11 02:33:43 -07:00
sunbmac.c	net: sunbmac: Use net_device_stats from struct net_device	2017-04-07 07:03:33 -07:00
sunbmac.h	net: sunbmac: Use net_device_stats from struct net_device	2017-04-07 07:03:33 -07:00
sungem.c	net: sun: sungem: rix a possible null dereference	2017-03-21 17:44:46 -07:00
sungem.h	cassini/niu/sun*: Move the Sun drivers	2011-08-11 02:33:43 -07:00
sunhme.c	net: sunhme: fix spelling mistakes: "ParityErro" -> "ParityError"	2017-04-30 22:55:47 -04:00
sunhme.h	sunhme: fix up GREG_STAT and GREG_IMASK register offsets	2017-07-31 16:23:05 -07:00
sunqe.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-22 13:27:16 -05:00
sunqe.h	sunqe: Fix compiler warnings	2016-11-18 11:18:26 -08:00
sunvnet.c	sunvnet: add support for IPv6 checksum offloads	2017-07-16 16:36:01 -07:00
sunvnet_common.c	sunvnet: add support for IPv6 checksum offloads	2017-07-16 16:36:01 -07:00
sunvnet_common.h	sunvnet: track port queues correctly	2017-03-16 20:29:54 -07:00