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

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

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

2015-12-17 22:08:28 -05:00

..

bnx2x

bnx2x: remove rx_pkt/rx_calls

2015-12-08 22:59:22 -05:00

bnxt

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

2015-12-17 22:08:28 -05:00

genet

net: add netif_tx_napi_add()

2015-11-18 16:17:41 -05: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

net: bcm63xx: Use platform_register/unregister_drivers()

2015-12-03 15:14:58 -05:00

bcm63xx_enet.h

bcm63xx_enet: add support Broadcom BCM6345 Ethernet

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

bcmsysport.c

net: add netif_tx_napi_add()

2015-11-18 16:17:41 -05:00

bcmsysport.h

net: systemport: Pre-calculate and utilize cb->bd_addr

2015-05-30 23:51:09 -07:00

bgmac.c

bgmac: Update fixed_phy_register()

2015-09-02 11:39:58 -07: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: free temp_stats_blk on error path

2015-10-12 19:33:46 -07:00

bnx2.h

BNX2: fix a Null Pointer for stats_blk

2015-10-11 05:06:21 -07:00

cnic_defs.h

cnic: Rebranding cnic driver.

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

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

cnic: Rebranding cnic driver.

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

Kconfig

bnxt_en: add VXLAN dependency

2015-11-05 00:00:25 -05:00

Makefile

bnxt_en: New Broadcom ethernet driver.

2015-10-22 19:30:33 -07:00

sb1250-mac.c

MIPS: SB1: Remove support for Pass 1 parts.

2015-07-14 21:47:34 +02:00

tg3.c

tg3: Fix temperature reporting

2015-09-01 15:03:59 -07:00

tg3.h

tg3: prevent ifup/ifdown during PCI error recovery

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