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

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index dd33abf44766f9f2de4b78da612de96c4615257c..a3287090f12cdc073d28637c92d58e076eece6f8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3158,10 +3158,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 +7409,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