Merge branch 'mlx4'
[firefly-linux-kernel-4.4.55.git] / MAINTAINERS
index 75106235a38dbf9f2250d2b5d113cf4036347963..7a06ea46c18caed3eb69bf5560f5134c94de8314 100644 (file)
@@ -597,6 +597,13 @@ L: amd64-microcode@amd64.org
 S:     Maintained
 F:     arch/x86/kernel/microcode_amd.c
 
+AMD XGBE DRIVER
+M:     Tom Lendacky <thomas.lendacky@amd.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/amd/xgbe/
+F:     drivers/net/phy/amd-xgbe-phy.c
+
 AMS (Apple Motion Sensor) DRIVER
 M:     Michael Hanselmann <linux-kernel@hansmi.ch>
 S:     Supported
@@ -1888,7 +1895,7 @@ F:        drivers/net/ethernet/broadcom/bnx2.*
 F:     drivers/net/ethernet/broadcom/bnx2_*
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
-M:     Ariel Elior <ariele@broadcom.com>
+M:     Ariel Elior <ariel.elior@qlogic.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2x/
@@ -3158,10 +3165,9 @@ S:       Maintained
 F:     drivers/scsi/eata_pio.*
 
 EBTABLES
-M:     Bart De Schuymer <bart.de.schuymer@pandora.be>
 L:     netfilter-devel@vger.kernel.org
 W:     http://ebtables.sourceforge.net/
-S:     Maintained
+S:     Orphan
 F:     include/linux/netfilter_bridge/ebt_*.h
 F:     include/uapi/linux/netfilter_bridge/ebt_*.h
 F:     net/bridge/netfilter/ebt*.c
@@ -7410,6 +7416,14 @@ F:       drivers/rpmsg/
 F:     Documentation/rpmsg.txt
 F:     include/linux/rpmsg.h
 
+RESET CONTROLLER FRAMEWORK
+M:     Philipp Zabel <p.zabel@pengutronix.de>
+S:     Maintained
+F:     drivers/reset/
+F:     Documentation/devicetree/bindings/reset/
+F:     include/linux/reset.h
+F:     include/linux/reset-controller.h
+
 RFKILL
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org