Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[platform/kernel/linux-rpi.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a2f1d14..0971854 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -909,13 +909,6 @@ L: netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/altera/
 
-ALTERA TSE PCS
-M:     Maxime Chevallier <maxime.chevallier@bootlin.com>
-L:     netdev@vger.kernel.org
-S:     Supported
-F:     drivers/net/pcs/pcs-altera-tse.c
-F:     include/linux/pcs-altera-tse.h
-
 ALTERA UART/JTAG UART SERIAL DRIVERS
 M:     Tobias Klauser <tklauser@distanz.ch>
 L:     linux-serial@vger.kernel.org
@@ -7978,6 +7971,12 @@ S:       Maintained
 F:     drivers/hwmon/f75375s.c
 F:     include/linux/f75375s.h
 
+FINTEK F81604 USB to 2xCANBUS DEVICE DRIVER
+M:     Ji-Ze Hong (Peter Hong) <peter_hong@fintek.com.tw>
+L:     linux-can@vger.kernel.org
+S:     Maintained
+F:     drivers/net/can/usb/f81604.c
+
 FIREWIRE AUDIO DRIVERS and IEC 61883-1/6 PACKET STREAMING ENGINE
 M:     Clemens Ladisch <clemens@ladisch.de>
 M:     Takashi Sakamoto <o-takashi@sakamocchi.jp>
@@ -10343,9 +10342,8 @@ M:      Jesse Brandeburg <jesse.brandeburg@intel.com>
 M:     Tony Nguyen <anthony.l.nguyen@intel.com>
 L:     intel-wired-lan@lists.osuosl.org (moderated for non-subscribers)
 S:     Supported
-W:     http://www.intel.com/support/feedback.htm
-W:     http://e1000.sourceforge.net/
-Q:     http://patchwork.ozlabs.org/project/intel-wired-lan/list/
+W:     https://www.intel.com/content/www/us/en/support.html
+Q:     https://patchwork.ozlabs.org/project/intel-wired-lan/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git
 F:     Documentation/networking/device_drivers/ethernet/intel/
@@ -12847,6 +12845,13 @@ F:     Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt
 F:     drivers/net/ieee802154/mcr20a.c
 F:     drivers/net/ieee802154/mcr20a.h
 
+MDIO REGMAP DRIVER
+M:     Maxime Chevallier <maxime.chevallier@bootlin.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/mdio/mdio-regmap.c
+F:     include/linux/mdio/mdio-regmap.h
+
 MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
 M:     William Breathitt Gray <william.gray@linaro.org>
 L:     linux-iio@vger.kernel.org