David S. Miller 182ad468e7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/cavium/Kconfig The cavium conflict was overlapping dependency changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-08-13 16:23:11 -07:00
..
bnx2x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-08-13 16:23:11 -07:00
genet	net: bcmgenet: Add netconsole support	2015-07-31 15:45:36 -07:00
b44.c	b44: call netif_napi_del()	2015-06-07 19:45:34 -07:00
b44.h	b44: Utilize BRCM_PSEUDO_PHY_ADDR	2015-06-10 23:33:58 -07:00
bcm63xx_enet.c	bcm63xx_enet: fix poll callback.	2015-03-04 15:44:52 -05:00
bcm63xx_enet.h
bcmsysport.c	net: systemport: Add netconsole support	2015-07-31 15:45:37 -07:00
bcmsysport.h	net: systemport: Pre-calculate and utilize cb->bd_addr	2015-05-30 23:51:09 -07:00
bgmac.c	bgmac: fix requests for extra polling calls from NAPI	2015-04-24 11:31:27 -04:00
bgmac.h	bgmac: Utilize BRCM_PSEUDO_PHY_ADDR	2015-06-10 23:33:58 -07:00
bnx2_fw.h	bnx2-cnic: Driver Rebranding Changes	2015-02-20 15:46:49 -05:00
bnx2.c	bnx2: disable toggling of rxvlan if necessary	2015-03-01 23:25:51 -05:00
bnx2.h	bnx2-cnic: Driver Rebranding Changes	2015-02-20 15:46:49 -05: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: Add the interfaces to get FC-NPIV table.	2015-08-06 21:54:12 -07:00
cnic.h
Kconfig	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile
sb1250-mac.c	MIPS: SB1: Remove support for Pass 1 parts.	2015-07-14 21:47:34 +02:00
tg3.c	bnx2x, tg3: Replace put_page(virt_to_head_page()) with skb_free_frag()	2015-05-12 10:39:27 -04:00
tg3.h