David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
cassini.c	net: sun: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles	2019-02-06 17:38:15 -08:00
cassini.h	net: sun: cassini: Cleanup license conflict	2019-01-22 11:22:07 -08:00
Kconfig
ldmvsw.c	net: sun: fix return type of ndo_start_xmit function	2018-09-19 21:17:58 -07:00
Makefile
niu.c	niu: fix missing checks of niu_pci_eeprom_read	2018-12-27 16:19:27 -08:00
niu.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sunbmac.c	net: sun: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles	2019-02-06 17:38:15 -08:00
sunbmac.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sungem.c	net: sungem: fix indentation, remove a tab	2019-01-16 14:04:59 -08:00
sungem.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sunhme.c	net: sun: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles	2019-02-06 17:38:15 -08:00
sunhme.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sunqe.c	net: sun: fix return type of ndo_start_xmit function	2018-09-19 21:17:58 -07:00
sunqe.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sunvnet.c	net: sun: fix return type of ndo_start_xmit function	2018-09-19 21:17:58 -07:00
sunvnet_common.c	net: sun: fix return type of ndo_start_xmit function	2018-09-19 21:17:58 -07:00
sunvnet_common.h	net: sun: fix return type of ndo_start_xmit function	2018-09-19 21:17:58 -07:00