linux-stable/drivers/net/ethernet/broadcom
David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/r8152.c
	drivers/net/xen-netback/netback.c

Both the r8152 and netback conflicts were simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-14 22:31:55 -04:00
..
bnx2x Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-05 20:32:02 -05:00
genet net: bcmgenet: remove unused bh_lock member 2014-02-24 20:26:37 -05:00
b44.c b44: always set duplex mode why phy changes 2014-03-02 19:05:25 -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 bcm63xx_enet: Stop pretending to support netpoll 2014-03-13 15:23:43 -04:00
bcm63xx_enet.h
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: Add a signature to indicate valid doorbell offset. 2014-01-01 22:08:08 -05:00
cnic.h cnic: Add a signature to indicate valid doorbell offset. 2014-01-01 22:08:08 -05:00
cnic_defs.h
cnic_if.h cnic: Add a signature to indicate valid doorbell offset. 2014-01-01 22:08:08 -05: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 tg3: Call dev_kfree_skby_any instead of dev_kfree_skb. 2014-03-12 16:22:13 -04:00
tg3.h tg3: Don't check undefined error bits in RXBD 2014-02-28 17:16:16 -05:00