David S. Miller 55b42b5ca2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/phy/marvell.c

Simple overlapping changes in drivers/net/phy/marvell.c

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

2014-11-01 14:53:27 -04:00

..

bnx2x

bnx2x: use napi_schedule_irqoff()

2014-10-30 16:50:47 -04:00

genet

net: bcmgenet: avoid unbalanced enable_irq_wake calls

2014-10-10 15:39:15 -04:00

b44.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-09-23 12:09:27 -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

net: get rid of SET_ETHTOOL_OPS

2014-05-13 17:43:20 -04:00

bcm63xx_enet.h

bcm63xx_enet: add support Broadcom BCM6345 Ethernet

2013-06-13 17:22:08 -07:00

bcmsysport.c

net: systemport: reset UniMAC coming out of a suspend cycle

2014-10-28 17:08:47 -04:00

bcmsysport.h

net: systemport: add Wake-on-LAN support

2014-07-07 20:56:47 -07:00

bgmac.c

net: get rid of SET_ETHTOOL_OPS

2014-05-13 17:43:20 -04:00

bgmac.h

bgmac: add support for Northstar SoC (BCM4707, BCM53018)

2014-01-04 20:25:20 -05:00

bnx2_fw.h

bnx2: Rebranding bnx2 driver.

2014-06-25 16:27:27 -07:00

bnx2.c

bnx2: Correctly receive full sized 802.1ad fragmes

2014-10-01 16:43:45 -04:00

bnx2.h

bnx2: Rebranding bnx2 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: Rebranding cnic driver.

2014-06-25 16:27:27 -07:00

cnic.c

cnic: Update the rcu_access_pointer() usages

2014-10-29 15:07:28 -04:00

cnic.h

cnic: Rebranding cnic driver.

2014-06-25 16:27:27 -07:00

Kconfig

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-09-07 21:41:53 -07:00

Makefile

net: systemport: hook SYSTEMPORT driver in the build

2014-04-26 12:57:40 -04: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: Add skb->xmit_more support

2014-10-14 15:59:37 -04:00

tg3.h

tg3: prevent ifup/ifdown during PCI error recovery

2014-09-02 13:02:19 -07:00