korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-17 03:14:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
b50f7bca5e
linux/drivers/net/ethernet/broadcom
History
David S. Miller 3ab0a7a0c3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Two minor conflicts:

1) net/ipv4/route.c, adding a new local variable while
   moving another local variable and removing it's
   initial assignment.

2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes.
   One pretty prints the port mode differently, whilst another
   changes the driver to try and obtain the port mode from
   the port node rather than the switch node.

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-09-22 16:45:34 -07:00
..
bnx2x bnx2x: use true,false for bool variables 2020-09-19 14:23:14 -07:00
bnxt Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-22 16:45:34 -07:00
genet Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-03 18:50:48 -07:00
b44.c net: b44: use true,false for bool variables 2020-09-19 14:23:13 -07:00
b44.h
bcm63xx_enet.c bcm63xx_enet: remove redundant variable definitions 2020-03-05 14:59:22 -08:00
bcm63xx_enet.h
bcmsysport.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-04 21:28:59 -07:00
bcmsysport.h net: systemport: Manage Wake-on-LAN clock 2020-09-03 15:06:03 -07:00
bgmac-bcma-mdio.c
bgmac-bcma.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
bgmac-platform.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
bgmac.c bgmac: configure MTU and add support for frames beyond 8192 byte size 2020-03-27 16:07:24 -07:00
bgmac.h bgmac: configure MTU and add support for frames beyond 8192 byte size 2020-03-27 16:07:24 -07:00
bnx2_fw.h
bnx2.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
bnx2.h
cnic_defs.h net: cnic: fix spelling mistake "reserverd" -> "reserved" 2020-02-17 21:59:16 -08:00
cnic_if.h
cnic.c cnic: convert tasklets to use new tasklet_setup() API 2020-09-14 13:02:37 -07:00
cnic.h
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile
sb1250-mac.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next 2020-01-28 16:02:33 -08:00
tg3.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-03 18:50:48 -07:00
tg3.h tg3: Avoid the use of one-element array 2020-07-22 18:11:07 -07:00