David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-23 18:51:33 -04:00
..
bnx2x	bnx2x: Prevent false warning for lack of FC NPIV	2016-03-18 19:17:16 -04:00
bnxt	bnxt_en: Add async event handling for speed config changes.	2016-04-11 14:58:45 -04:00
genet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
Kconfig	bnx2x: add a separate GENEVE Kconfig symbol	2016-02-24 22:48:54 -05:00
Makefile	bnxt_en: New Broadcom ethernet driver.	2015-10-22 19:30:33 -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	bcm63xx_enet: add support Broadcom BCM6345 Ethernet	2013-06-13 17:22:08 -07:00
bcmsysport.c	net: bcmsysport: use napi_complete_done()	2016-04-21 15:06:04 -04:00
bcmsysport.h	net: systemport: Pre-calculate and utilize cb->bd_addr	2015-05-30 23:51:09 -07:00
bgmac.c	bgmac: reset & enable Ethernet core before using it	2016-04-14 17:15:55 -04:00
bgmac.h	bgmac: fix MAC soft-reset bit for corerev > 4	2016-04-14 21:17:14 -04: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
bnx2_fw.h	bnx2-cnic: Driver Rebranding Changes	2015-02-20 15:46:49 -05:00
cnic.c	cnic: Add the interfaces to get FC-NPIV table.	2015-08-06 21:54:12 -07: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	net: ethernet: broadcom: Fix build errors	2016-01-10 22:05:30 -05:00
tg3.c	tg3: Fix for tg3 transmit queue 0 timed out when too many gso_segs	2016-02-09 04:39:14 -05:00
tg3.h	mdio: Move allocation of interrupts into core	2016-01-07 14:31:26 -05:00