David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
bnx2x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
bnxt	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
genet	net: bcmgenet: remove HFB_CTRL access	2018-11-23 11:10:25 -08:00
b44.c	net: ethernet: Convert phydev advertize and supported from u32 to link mode	2018-11-11 10:10:01 -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	net: broadcom: fix return type of ndo_start_xmit function	2018-09-19 21:17:58 -07:00
bcm63xx_enet.h	bcm63xx_enet: use platform device id directly for miibus name	2017-12-19 11:07:16 -05:00
bcmsysport.c	net: systemport: Unmap queues upon DSA unregister event	2018-11-06 15:39:48 -08:00
bcmsysport.h	net: systemport: Simplify queue mapping logic	2018-11-06 15:39:48 -08:00
bgmac-bcma-mdio.c	net: bgmac: use PHY subsystem for initializing PHY	2017-01-31 13:44:49 -05:00
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: remove set but not used variable 'err'	2018-09-01 22:30:41 -07:00
bgmac.h	net: bgmac: Correctly annotate register space	2018-04-01 22:20:48 -04:00
bnx2_fw.h	bnx2-cnic: Driver Rebranding Changes	2015-02-20 15:46:49 -05:00
bnx2.c	PCI/AER: Remove pci_cleanup_aer_uncorrect_error_status() calls	2018-10-02 16:04:40 -05:00
bnx2.h	ethernet/broadcom: use core min/max MTU checking	2016-10-18 11:34:18 -04:00
cnic_defs.h
cnic_if.h	cnic: Add the interfaces to get FC-NPIV table.	2015-08-06 21:54:12 -07:00
cnic.c	cnic: remove use of VLAN_TAG_PRESENT	2018-11-08 19:49:31 -08:00
cnic.h
Kconfig	bnxt_en: Add hwmon sysfs support to read temperature	2018-08-05 17:08:26 -07: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: broadcom: fix return type of ndo_start_xmit function	2018-09-19 21:17:58 -07:00
tg3.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-11-24 17:01:43 -08:00
tg3.h	tg3: Update copyright	2018-07-16 14:42:10 -07:00