David S. Miller 68aaf44595 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Minor conflict in r8169, bug fix had two versions in net and net-next, take the net-next hunks. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-27 14:23:31 -07:00
..
Kconfig
Makefile	net: mscc: ocelot: Hardware ofload for tc flower filter	2019-06-02 13:49:49 -07:00
ocelot_ace.c	ocelot_ace: fix action of trap	2019-08-22 15:44:24 -07:00
ocelot_ace.h	drivers: net: use flow block API	2019-07-09 14:38:50 -07:00
ocelot_ana.h
ocelot_board.c	net: mscc: PTP Hardware Clock (PHC) support	2019-08-15 16:31:12 -07:00
ocelot_dev.h
ocelot_flower.c	net: sched: use major priority number as hardware priority	2019-08-18 14:13:23 -07:00
ocelot_io.c
ocelot_police.c	net: mscc: ocelot: Implement port policers via tc command	2019-05-29 21:37:49 -07:00
ocelot_police.h	net: mscc: ocelot: Implement port policers via tc command	2019-05-29 21:37:49 -07:00
ocelot_ptp.h	net: mscc: describe the PTP register range	2019-08-15 16:31:11 -07:00
ocelot_qs.h
ocelot_qsys.h
ocelot_regs.c	net: mscc: describe the PTP register range	2019-08-15 16:31:11 -07:00
ocelot_rew.h
ocelot_s2.h	net: mscc: ocelot: Add support for tcam	2019-06-02 13:49:49 -07:00
ocelot_sys.h
ocelot_tc.c	net: flow_offload: add flow_block structure and use it	2019-07-19 21:27:45 -07:00
ocelot_tc.h	net: mscc: ocelot: Implement port policers via tc command	2019-05-29 21:37:49 -07:00
ocelot_vcap.h	net: mscc: ocelot: Add support for tcam	2019-06-02 13:49:49 -07:00
ocelot.c	net: mscc: PTP Hardware Clock (PHC) support	2019-08-15 16:31:12 -07:00
ocelot.h	net: mscc: PTP Hardware Clock (PHC) support	2019-08-15 16:31:12 -07:00