leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
71a83a6db6
linux/drivers/net/ethernet/broadcom
History
David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-03 21:16:48 -05:00
..
bnx2x ethernet: Use eth_<foo>_addr instead of memset 2015-03-03 17:01:36 -05:00
genet Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-03-03 21:16:48 -05:00
b44.c treewide: Remove unnecessary SSB_DEVTABLE_END macro 2015-02-11 14:38:29 -08:00
b44.h
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
bcmsysport.c net: systemport: fix software maintained statistics 2015-03-01 14:02:11 -05:00
bcmsysport.h net: systemport: fix software maintained statistics 2015-03-01 14:02:11 -05:00
bgmac.c bgmac: fix device initialization on Northstar SoCs (condition typo) 2015-02-11 19:44:21 -08:00
bgmac.h
bnx2_fw.h bnx2-cnic: Driver Rebranding Changes 2015-02-20 15:46:49 -05:00
bnx2.c bnx2: disable toggling of rxvlan if necessary 2015-03-01 23:25:51 -05:00
bnx2.h bnx2-cnic: Driver Rebranding Changes 2015-02-20 15:46:49 -05:00
cnic_defs.h cnic: Rebranding cnic driver. 2014-06-25 16:27:27 -07:00
cnic_if.h bnx2-cnic: Driver Version Update 2015-02-20 15:46:49 -05:00
cnic.c bnx2-cnic: Driver Rebranding Changes 2015-02-20 15:46:49 -05:00
cnic.h cnic: Rebranding cnic driver. 2014-06-25 16:27:27 -07:00
Kconfig bnx2-cnic: Driver Rebranding Changes 2015-02-20 15:46:49 -05:00
Makefile
sb1250-mac.c net: ethernet: broadcom: drop owner assignment from platform_drivers 2014-10-20 16:21:05 +02:00
tg3.c tg3: Hold tp->lock before calling tg3_halt() from tg3_init_one() 2015-02-11 19:51:08 -08:00
tg3.h tg3: prevent ifup/ifdown during PCI error recovery 2014-09-02 13:02:19 -07:00