David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en.h drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/usb/r8152.c All three conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-07-06 10:35:22 -07:00
..
bnx2x	bnx2x: Move all UDP port notifiers to single function	2016-06-17 20:23:29 -07:00
bnxt	bnxt_en: Allow statistics DMA to be configurable using ethtool -C.	2016-07-02 14:52:36 -04:00
genet	net: ethernet: bcmgenet: use phy_ethtool_{get|set}_link_ksettings	2016-07-04 16:02:45 -07:00
b44.c	phy: Add API for {un}registering an mdio device to a bus.	2016-01-07 14:31:26 -05:00
b44.h
bcm63xx_enet.c	mdio: Move allocation of interrupts into core	2016-01-07 14:31:26 -05:00
bcm63xx_enet.h
bcmsysport.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
bcmsysport.h	net: ethernet: bcmsysport: use phydev from struct net_device	2016-06-19 16:15:55 -07:00
bgmac.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-30 05:03:36 -04:00
bgmac.h	net: ethernet: bgmac: use phydev from struct net_device	2016-06-22 16:23:29 -04:00
bnx2_fw.h
bnx2.c
bnx2.h
cnic_defs.h
cnic_if.h
cnic.c	cnic: call cp->stop_hw() in cnic_start_hw() on allocation failure	2016-05-06 15:44:54 -04:00
cnic.h
Kconfig	bnxt: Update drivers to support unified UDP encapsulation offload functions	2016-06-17 20:23:29 -07:00
Makefile	bnxt_en: New Broadcom ethernet driver.	2015-10-22 19:30:33 -07:00
sb1250-mac.c	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
tg3.c	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
tg3.h	mdio: Move allocation of interrupts into core	2016-01-07 14:31:26 -05:00