linux/drivers/net/fddi
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
..
skfp net: fddi: skfp: Mark expected switch fall-through 2019-02-08 11:56:11 -08:00
defxx.c net: defxx: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles 2019-02-06 17:38:15 -08:00
defxx.h defxx: Clean up DEFEA resource management 2014-11-21 16:37:13 -05:00
defza.c FDDI: defza: Make the driver version string constant 2018-11-07 21:53:31 -08:00
defza.h FDDI: defza: Add missing comment closing 2018-11-07 21:53:30 -08:00
Kconfig FDDI: defza: Add support for DEC FDDIcontroller 700 TURBOchannel adapter 2018-10-15 21:46:06 -07:00
Makefile FDDI: defza: Add support for DEC FDDIcontroller 700 TURBOchannel adapter 2018-10-15 21:46:06 -07:00