Btrfs: use bitfield instead of integer data type for the some variants in btrfs_root

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cc4511177949e3539946f441166586e50212ac2c..6c484ac93da7814259f026d5b95f0f98d6960b38 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3153,10 +3153,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
@@ -7405,6 +7404,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