linux_dsm_epyc7002/drivers/net/ethernet/amd
David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of easy overlapping changes in the confict
resolutions here.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-05-26 19:46:15 -04:00
..
xgbe amd-xgbe: Improve SFP 100Mbps auto-negotiation 2018-05-23 16:33:01 -04:00
7990.c ethernet: amd: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:58 -07:00
7990.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
a2065.c drivers/net: amd: Convert timers to use timer_setup() 2017-10-28 19:09:49 +09:00
a2065.h
am79c961a.c drivers/net: amd: Convert timers to use timer_setup() 2017-10-28 19:09:49 +09:00
am79c961a.h drivers/net: amd: Convert timers to use timer_setup() 2017-10-28 19:09:49 +09:00
amd8111e.c net: amd8111e: remove redundant duplicated if statement 2018-04-25 14:11:27 -04:00
amd8111e.h scripts/spelling.txt: add regsiter -> register spelling mistake 2017-05-08 17:15:13 -07:00
ariadne.c net: amd: constify zorro_device_id 2017-08-22 14:35:36 -07:00
ariadne.h
atarilance.c format-security: move static strings to const 2017-05-08 17:15:14 -07:00
au1000_eth.c au1000_eth: switch to dma_alloc_attrs 2017-08-29 10:03:27 +02:00
au1000_eth.h net: ethernet: amd: au1000_eth: use phydev from struct net_device 2016-07-15 16:41:35 -07:00
declance.c drivers/net: amd: Convert timers to use timer_setup() 2017-10-28 19:09:49 +09:00
hplance.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
hplance.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Kconfig Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2016-12-12 19:56:15 -08:00
lance.c Annotate hardware config module parameters in drivers/net/ethernet/ 2017-04-20 12:02:32 +01:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mvme147.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
ni65.c Annotate hardware config module parameters in drivers/net/ethernet/ 2017-04-20 12:02:32 +01:00
ni65.h
nmclan_cs.c net: nmlan_cs: Use net_device_stats from struct net_device 2017-04-07 07:03:33 -07:00
pcnet32.c pcnet32: add an error handling path in pcnet32_probe_pci() 2018-05-22 15:40:15 -04:00
sun3lance.c format-security: move static strings to const 2017-05-08 17:15:14 -07:00
sunlance.c drivers/net: amd: Convert timers to use timer_setup() 2017-10-28 19:09:49 +09:00