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

..

ocelot_ana.h

…

ocelot_dev.h

net: mscc: ocelot: properly account for VLAN header length when setting MRU

2020-03-09 18:58:17 -07:00

ocelot_hsio.h

…

ocelot_ptp.h

net: mscc: ocelot: support 4 PTP programmable pins

2020-04-21 15:38:33 -07:00

ocelot_qsys.h

…

ocelot_sys.h

…

ocelot_vcap.h

net: mscc: ocelot: parameterize the vcap_is2 properties

2020-03-03 18:57:49 -08:00

ocelot.h

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

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