alistair23-linux/drivers/net/wireless/ti
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
..
wl12xx treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
wl18xx treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
wl1251 wl1251, wlcore: fix spelling mistake "buld" -> "build" 2020-08-18 15:50:31 +03:00
wlcore Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-22 16:45:34 -07:00
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile
wilink_platform_data.c