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
..
Kconfig	net: dsa: ksz: Select KSZ protocol tag	2020-03-31 10:04:40 -07:00
ksz8795_reg.h	net: dsa: ksz: Add Microchip KSZ8795 DSA driver	2019-07-30 15:12:50 -07:00
ksz8795_spi.c	net: dsa: microchip: Add shared regmap mutex	2019-10-17 15:38:46 -04:00
ksz8795.c	net: dsa: microchip: ksz8795: really set the correct number of ports	2020-09-16 17:46:09 -07:00
ksz9477_i2c.c	net: dsa: microchip: enable ksz9893 via i2c in the ksz9477 driver	2020-07-01 17:48:47 -07:00
ksz9477_reg.h	net: dsa: microchip: Use the correct style for SPDX License Identifier	2019-10-15 14:59:58 -07:00
ksz9477_spi.c	net: dsa: microchip: enable module autoprobe	2020-02-07 18:45:12 +01:00
ksz9477.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-09-22 16:45:34 -07:00
ksz_common.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-09-22 16:45:34 -07:00
ksz_common.h	net: dsa: microchip: look for phy-mode in port nodes	2020-09-10 12:32:37 -07:00
Makefile	net: dsa: microchip: add KSZ9477 I2C driver	2019-09-12 11:36:12 +01:00