linux/drivers/net/ethernet/broadcom
David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-12-10 15:48:20 -05:00
..
bnx2x Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-12-10 15:48:20 -05:00
genet net: bcmgenet: add support for new GENET PHY revision scheme 2014-12-08 21:33:29 -05:00
b44.c ethernet/broadcom: Use napi_alloc_skb instead of netdev_alloc_skb_ip_align 2014-12-10 13:31:58 -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 ethernet/broadcom: Use napi_alloc_skb instead of netdev_alloc_skb_ip_align 2014-12-10 13:31:58 -05:00
bcm63xx_enet.h bcm63xx_enet: add support Broadcom BCM6345 Ethernet 2013-06-13 17:22:08 -07:00
bcmsysport.c net: systemport: allow changing MAC address 2014-12-09 18:26:08 -05:00
bcmsysport.h net: systemport: log RX buffer allocation and RX/TX DMA failures 2014-11-21 14:46:12 -05: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 net: bcmgenet: enable driver to work without a device tree 2014-12-08 20:26:59 -05: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 ethtool: Support for configurable RSS hash function 2014-12-08 21:07:10 -05:00
tg3.h tg3: prevent ifup/ifdown during PCI error recovery 2014-09-02 13:02:19 -07:00