David S. Miller 64c27237a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/marvell/mvneta.c The mvneta.c conflict is a case of overlapping changes, a conversion to devm_ioremap_resource() vs. a conversion to netdev_alloc_pcpu_stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-29 18:48:54 -04:00
..
bnx2x	bnx2x: Fix possible memory leak on iov error flow	2014-03-28 16:18:02 -04:00
genet	net: bcmgenet: set RBUF_SKIP_FCS based on UniMAC CRC forwarding	2014-03-27 15:49:42 -04:00
b44.c	net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq	2014-03-14 22:41:36 -04: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: Stop pretending to support netpoll	2014-03-13 15:23:43 -04:00
bcm63xx_enet.h	bcm63xx_enet: add support Broadcom BCM6345 Ethernet	2013-06-13 17:22:08 -07:00
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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
bnx2.h	bnx2: Fix shutdown sequence	2014-03-09 19:02:27 -04:00
bnx2_fw.h
cnic.c	cnic: Update version to 2.5.20 and copyright year.	2014-03-18 16:02:16 -04:00
cnic.h	cnic: Update version to 2.5.20 and copyright year.	2014-03-18 16:02:16 -04:00
cnic_defs.h	cnic: Update version to 2.5.20 and copyright year.	2014-03-18 16:02:16 -04:00
cnic_if.h	cnic: Update version to 2.5.20 and copyright year.	2014-03-18 16:02:16 -04: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04:00
tg3.h	tg3: Don't check undefined error bits in RXBD	2014-02-28 17:16:16 -05:00