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	net: mscc: ocelot: export ANA, DEV and QSYS registers to include/soc/mscc	2020-01-05 23:22:33 -08:00
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	net: mscc: ocelot: export ANA, DEV and QSYS registers to include/soc/mscc	2020-01-05 23:22:33 -08:00
ocelot_sys.h	net: mscc: ocelot: publish ocelot_sys.h to include/soc/mscc	2019-11-15 12:32:16 -08:00
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