1
0
Fork 0
alistair23-linux/drivers/net/ethernet/broadcom
David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-03 23:32:12 -07:00
..
bnx2x Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-06-03 23:32:12 -07:00
genet net: bcmgenet: use the new fixed PHY helpers 2014-05-22 15:16:43 -04:00
Kconfig net: systemport: hook SYSTEMPORT driver in the build 2014-04-26 12:57:40 -04:00
Makefile net: systemport: hook SYSTEMPORT driver in the build 2014-04-26 12:57:40 -04:00
b44.c net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -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 drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC 2014-06-02 16:45:34 -07:00
bcmsysport.h drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC 2014-06-02 16:45:34 -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.c bnx2: Don't build unused suspend/resume functions not enabled 2014-04-14 12:40:00 -04:00
bnx2.h bnx2: Fix shutdown sequence 2014-03-09 19:02:27 -04:00
bnx2_fw.h
cnic.c cnic: Fix missing ISCSI_KEVENT_IF_DOWN message 2014-06-02 23:16:41 -07:00
cnic.h cnic: Update version to 2.5.20 and copyright year. 2014-03-18 16:02:16 -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
sb1250-mac.c drivers/net: delete non-required instances of include <linux/init.h> 2014-01-16 11:53:26 -08:00
tg3.c Merge branch 'ethtool-rssh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/net-next 2014-06-02 23:07:02 -07:00
tg3.h tg3: Update copyright and version to 3.137 2014-05-13 18:38:51 -04:00