David S. Miller 5cd3da4ba2 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Simple overlapping changes in stmmac driver. Adjust skb_gro_flush_final_remcsum function signature to make GRO list changes in net-next, as per Stephen Rothwell's example merge resolution. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-03 10:29:26 +09:00
..
Kconfig	fsl/fman: remove unnecessary set_dma_ops() call and HAS_DMA dependency	2018-03-26 11:30:06 -04:00
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
fman.c	fsl/fman: share the event interrupt	2018-06-26 22:15:14 +09:00
fman.h	fsl/fman: define frame description command UPD	2018-06-26 22:15:14 +09:00
fman_dtsec.c	fsl/fman: add set_tstamp interface	2018-06-26 22:15:14 +09:00
fman_dtsec.h	fsl/fman: add set_tstamp interface	2018-06-26 22:15:14 +09:00
fman_keygen.c	fsl/fman: enable FMan Keygen	2017-08-28 16:41:00 -07:00
fman_keygen.h	fsl/fman: enable FMan Keygen	2017-08-28 16:41:00 -07:00
fman_mac.h	fsl/fman: remove leftover comment	2016-10-04 10:08:44 +03:00
fman_memac.c	fsl/fman: add set_tstamp interface	2018-06-26 22:15:14 +09:00
fman_memac.h	fsl/fman: add set_tstamp interface	2018-06-26 22:15:14 +09:00
fman_muram.c	fsl/fman: split lines over 80 characters	2016-10-04 09:26:05 +03:00
fman_muram.h	fsl/fman: split lines over 80 characters	2016-10-04 09:26:05 +03:00
fman_port.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-03 10:29:26 +09:00
fman_port.h	fsl/fman_port: support getting timestamp	2018-06-26 22:15:14 +09:00
fman_sp.c	fsl/fman: fix loadable module compilation	2016-10-04 09:26:05 +03:00
fman_sp.h	fsl/fman: Add FMan SP support	2015-12-27 20:51:40 -05:00
fman_tgec.c	fsl/fman: add set_tstamp interface	2018-06-26 22:15:14 +09:00
fman_tgec.h	fsl/fman: add set_tstamp interface	2018-06-26 22:15:14 +09:00
mac.c	fsl/fman: add set_tstamp interface	2018-06-26 22:15:14 +09:00
mac.h	fsl/fman: add set_tstamp interface	2018-06-26 22:15:14 +09:00