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

..

fjes_debugfs.c

fjes: no need to check return value of debugfs_create functions

2019-06-22 16:43:08 -07:00

fjes_ethtool.c

treewide: Use sizeof_field() macro

2019-12-09 10:36:44 -08:00

fjes_hw.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 308

2019-06-05 17:37:04 +02:00

fjes_hw.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 308

2019-06-05 17:37:04 +02:00

fjes_main.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-12-22 15:15:05 -08:00

fjes_regs.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 308

2019-06-05 17:37:04 +02:00

fjes_trace.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 308

2019-06-05 17:37:04 +02:00

fjes_trace.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 308

2019-06-05 17:37:04 +02:00

fjes.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 308

2019-06-05 17:37:04 +02:00

Makefile

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 308

2019-06-05 17:37:04 +02:00