David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
xgbe	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
7990.c
7990.h
a2065.c
a2065.h
am79c961a.c
am79c961a.h
amd8111e.c	net: amd8111e: remove redundant duplicated if statement	2018-04-25 14:11:27 -04:00
amd8111e.h
ariadne.c
ariadne.h
atarilance.c
au1000_eth.c
au1000_eth.h
declance.c
hplance.c
hplance.h
Kconfig	net: prevent ISA drivers from building on PPC32	2018-07-22 11:12:29 -07:00
lance.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
Makefile
mvme147.c
ni65.c
ni65.h
nmclan_cs.c
pcnet32.c	net: amd: pcnet32: Replace GFP_ATOMIC with GFP_KERNEL in pcnet32_alloc_ring()	2018-07-27 13:45:14 -07:00
sun3lance.c
sunlance.c