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
..
.gitignore
adummy.c
ambassador.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-29 13:10:25 -08:00
ambassador.h
atmtcp.c
eni.c	atm: eni: fix several indentation issues	2017-11-30 09:26:32 -05:00
eni.h
firestream.c	firestream: fix spelling mistake: "reseverd" -> "reserved"	2018-05-10 15:23:49 -04:00
firestream.h
fore200e.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
fore200e.h
he.c	atm: he: use 64-bit arithmetic instead of 32-bit	2018-02-08 15:05:16 -05:00
he.h
horizon.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
horizon.h
idt77105.c	treewide: Switch DEFINE_TIMER callbacks to struct timer_list *	2017-11-21 15:57:05 -08:00
idt77105.h
idt77252_tables.h
idt77252.c	atm: idt77252: remove redundant bit-wise or'ing of zero	2018-02-23 12:42:26 -05:00
idt77252.h
iphase.c	atm: iphase: fix a 64 bit bug	2018-06-30 18:44:38 +09:00
iphase.h
Kconfig
lanai.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-29 13:10:25 -08:00
Makefile
midway.h
nicstar.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
nicstar.h
nicstarmac.c
nicstarmac.copyright
solos-attrlist.c
solos-pci.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
suni.c	atm: suni: remove extraneous space to fix indentation	2017-11-28 16:03:09 -05:00
suni.h
tonga.h
uPD98401.h
uPD98402.c
uPD98402.h
zatm.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-03 10:29:26 +09:00
zatm.h
zeprom.h