linux_dsm_epyc7002/drivers/net/ethernet/broadcom
David S. Miller 7cda4cee13 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-12-05 10:44:19 -05:00
..
bnx2x treewide: setup_timer() -> timer_setup() 2017-11-21 15:57:07 -08:00
bnxt Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-12-05 10:44:19 -05:00
genet net: bcmgenet: Avoid calling platform_device_put() twice in bcmgenet_mii_exit() 2017-11-01 11:56:14 +09:00
b44.c treewide: setup_timer() -> timer_setup() 2017-11-21 15:57:07 -08:00
b44.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
bcm63xx_enet.c ethernet/broadcom: Convert timers to use timer_setup() 2017-10-18 12:39:37 +01:00
bcm63xx_enet.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-11-04 09:26:51 +09:00
bcmsysport.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-11-04 09:26:51 +09:00
bcmsysport.h net: systemport: Only inspect valid switch port & queues 2017-11-02 16:49:28 +09:00
bgmac-bcma-mdio.c
bgmac-bcma.c net: bgmac: enable master mode for BCM54210E and B50212E PHYs 2017-10-12 22:59:38 -07:00
bgmac-platform.c net: ethernet: bgmac: mark expected switch fall-through 2017-11-11 18:49:26 +09:00
bgmac.c net: bgmac: Pad packets to a minimum size 2017-11-11 21:55:15 +09:00
bgmac.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
bnx2_fw.h
bnx2.c treewide: setup_timer() -> timer_setup() 2017-11-21 15:57:07 -08:00
bnx2.h
cnic_defs.h
cnic_if.h
cnic.c cnic: Fix an error handling path in 'cnic_alloc_bnx2x_resc()' 2017-09-23 17:04:27 -07:00
cnic.h
Kconfig net: systemport: add NET_DSA dependency 2017-10-16 21:21:05 +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
sb1250-mac.c net: ethernet: broadcom: Remove null check before kfree 2017-08-28 15:53:23 -07:00
tg3.c treewide: setup_timer() -> timer_setup() 2017-11-21 15:57:07 -08:00
tg3.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00