David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	Documentation/devicetree/bindings/net/micrel-ks8851.txt
	net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-03-25 20:29:20 -04:00

..

bnx2x

bnx2x: Don't receive packets when the napi budget == 0

2014-03-14 22:52:47 -04:00

genet

net: bcmgenet: manipulate netdev_queue directly

2014-03-20 17:36:12 -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_fw.h

broadcom: Move the Broadcom drivers

2011-08-10 19:54:39 -07: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

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

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

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

ptp: drivers: set the number of programmable pins.

2014-03-21 14:21:14 -04:00

tg3.h

tg3: Don't check undefined error bits in RXBD

2014-02-28 17:16:16 -05:00