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

[muen/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f835946d78ce8a92f615aea343d15191f288696c..f8ff9ae52c21085372c31d04a1c7ed4f02cd1494 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3204,6 +3204,7 @@ F:        drivers/phy/broadcom/phy-brcm-usb*
 BROADCOM GENET ETHERNET DRIVER
 M:     Doug Berger <opendmb@gmail.com>
 M:     Florian Fainelli <f.fainelli@gmail.com>
 BROADCOM GENET ETHERNET DRIVER
 M:     Doug Berger <opendmb@gmail.com>
 M:     Florian Fainelli <f.fainelli@gmail.com>

+L:     bcm-kernel-feedback-list@broadcom.com

 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/genet/
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/genet/


@@ -3311,6 +3312,7 @@ F:        drivers/spi/spi-iproc-qspi.c
 
 BROADCOM SYSTEMPORT ETHERNET DRIVER
 M:     Florian Fainelli <f.fainelli@gmail.com>
 
 BROADCOM SYSTEMPORT ETHERNET DRIVER
 M:     Florian Fainelli <f.fainelli@gmail.com>

+L:     bcm-kernel-feedback-list@broadcom.com

 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bcmsysport.*
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bcmsysport.*