David S. Miller ac80010fc9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Mere overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-12-22 15:15:05 -08:00
..
gemini.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-12-22 15:15:05 -08:00
gemini.h	net: ethernet: Use the correct style for SPDX License Identifier	2019-10-25 19:30:31 -07:00
Kconfig
Makefile