David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_3ad.h drivers/net/bonding/bond_main.c Two minor conflicts in bonding, both of which were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-02-19 01:24:22 -05:00
..
bnx2x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-02-19 01:24:22 -05:00
genet	net: bcmgenet: hook into the build system	2014-02-14 00:27:58 -05:00
b44.c	b44: use fixed PHY device if we do not find any	2013-12-20 20:48:49 -05:00
b44.h	b44: use fixed PHY device if we do not find any	2013-12-20 20:48:49 -05:00
bcm63xx_enet.c	bcm63xx_enet: remove deprecated IRQF_DISABLED	2013-09-11 16:09:58 -04:00
bcm63xx_enet.h
bgmac.c	bgmac: propagate error codes in bgmac_probe()	2014-01-14 18:19:20 -08:00
bgmac.h	bgmac: add support for Northstar SoC (BCM4707, BCM53018)	2014-01-04 20:25:20 -05:00
bnx2.c	bnx2: Use pci_enable_msix_range() instead of pci_enable_msix()	2014-02-18 15:33:29 -05:00
bnx2.h	bnx2: Report MDI/MDIX status to ethtool.	2014-01-01 22:03:38 -05:00
bnx2_fw.h
cnic.c	cnic: Add a signature to indicate valid doorbell offset.	2014-01-01 22:08:08 -05:00
cnic.h	cnic: Add a signature to indicate valid doorbell offset.	2014-01-01 22:08:08 -05:00
cnic_defs.h
cnic_if.h	cnic: Add a signature to indicate valid doorbell offset.	2014-01-01 22:08:08 -05:00
Kconfig	net: bcmgenet: hook into the build system	2014-02-14 00:27:58 -05:00
Makefile	net: bcmgenet: hook into the build system	2014-02-14 00:27:58 -05:00
sb1250-mac.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
tg3.c	tg3: Use pci_enable_msix_range() instead of pci_enable_msix()	2014-02-18 15:33:29 -05:00
tg3.h	tg3: Poll cpmu link state on APE + ASF enabled devices	2014-01-03 20:59:52 -05:00