David S. Miller 101c431492 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/genet/bcmgenet.c net/core/sock.c Conflicts were overlapping changes in bcmgenet and the lockdep handling of sockets. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-03-15 11:59:10 -07:00
..
bnx2x	bnx2x: add missing configuration of VF VLAN filters	2017-03-07 13:47:15 -08:00
bnxt	bnxt_en: Ignore 0 value in autoneg supported speed from firmware.	2017-03-09 17:38:31 -08:00
genet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-03-15 11:59:10 -07:00
Kconfig	tg3: Add the ability to conditionally build w/ HWMON	2017-03-09 13:03:00 -08:00
Makefile	net: ethernet: bgmac: Add platform device support	2016-07-09 18:10:41 -04:00
b44.c	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
b44.h	net: ethernet: broadcom: b44: use phydev from struct net_device	2016-09-19 21:39:11 -04:00
bcm63xx_enet.c	scripts/spelling.txt: add "overrided" pattern and fix typo instances	2017-02-27 18:43:47 -08:00
bcm63xx_enet.h	net: ethernet: broadcom: bcm63xx: use phydev from struct net_device	2016-09-19 21:39:12 -04:00
bcmsysport.c	net: systemport: Add support for SYSTEMPORT Lite	2017-01-22 16:56:06 -05:00
bcmsysport.h	net: systemport: Add support for SYSTEMPORT Lite	2017-01-22 16:56:06 -05: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: ethernet: bgmac: unify code of the same family	2017-03-06 17:17:47 -08:00
bgmac-platform.c	net: ethernet: bgmac: driver power manangement	2017-03-06 17:17:47 -08:00
bgmac.c	net: ethernet: bgmac: driver power manangement	2017-03-06 17:17:47 -08:00
bgmac.h	net: ethernet: bgmac: driver power manangement	2017-03-06 17:17:47 -08:00
bnx2.c	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
bnx2.h	ethernet/broadcom: use core min/max MTU checking	2016-10-18 11:34:18 -04:00
bnx2_fw.h	bnx2-cnic: Driver Rebranding Changes	2015-02-20 15:46:49 -05:00
cnic.c	net-next: treewide use is_vlan_dev() helper function.	2017-02-06 16:33:29 -05:00
cnic.h	cnic: Rebranding cnic driver.	2014-06-25 16:27:27 -07:00
cnic_defs.h	cnic: Rebranding cnic driver.	2014-06-25 16:27:27 -07:00
cnic_if.h	cnic: Add the interfaces to get FC-NPIV table.	2015-08-06 21:54:12 -07:00
sb1250-mac.c	drivers: net: ethernet: remove incorrect __exit markups	2017-03-02 14:33:49 -08:00
tg3.c	tg3: Add the ability to conditionally build w/ HWMON	2017-03-09 13:03:00 -08:00
tg3.h	mdio: Move allocation of interrupts into core	2016-01-07 14:31:26 -05:00