David S. Miller 3793faad7b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Conflicts were all overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2020-05-06 22:10:13 -07:00

..

felix_vsc9959.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-05-06 22:10:13 -07:00

felix.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-05-06 22:10:13 -07:00

felix.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-05-06 22:10:13 -07:00

Kconfig

net: dsa: felix: Add PCS operations for PHYLINK

2020-01-05 23:22:33 -08:00

Makefile

net: dsa: ocelot: add driver for Felix switch family

2019-11-15 12:32:16 -08:00