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

b44: Utilize BRCM_PSEUDO_PHY_ADDR

2015-06-10 23:33:58 -07:00

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-cnic: Driver Rebranding Changes

2015-02-20 15:46:49 -05:00

bnx2.c

BNX2: free temp_stats_blk on error path

2015-10-12 19:33:46 -07:00

bnx2.h

BNX2: fix a Null Pointer for stats_blk

2015-10-11 05:06:21 -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

cnic.c

cnic: call cp->stop_hw() in cnic_start_hw() on allocation failure

2016-05-06 15:44:54 -04:00

cnic.h

cnic: Rebranding cnic driver.

2014-06-25 16:27:27 -07:00

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