ARM: sunxi_defconfig: enable CONFIG_REGULATOR

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c523679..b0f17d5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3164,7 +3164,7 @@ F:        include/drm/drm_panel.h
 F:     Documentation/devicetree/bindings/panel/
 
 INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
-M:     Daniel Vetter <daniel.vetter@ffwll.ch>
+M:     Daniel Vetter <daniel.vetter@intel.com>
 M:     Jani Nikula <jani.nikula@linux.intel.com>
 L:     intel-gfx@lists.freedesktop.org
 L:     dri-devel@lists.freedesktop.org
@@ -6010,6 +6010,15 @@ S:       Supported
 F:     drivers/mcb/
 F:     include/linux/mcb.h
 
+MEN F21BMC (Board Management Controller)
+M:     Andreas Werner <andreas.werner@men.de>
+S:     Supported
+F:     drivers/mfd/menf21bmc.c
+F:     drivers/watchdog/menf21bmc_wdt.c
+F:     drivers/leds/leds-menf21bmc.c
+F:     drivers/hwmon/menf21bmc_hwmon.c
+F:     Documentation/hwmon/menf21bmc
+
 METAG ARCHITECTURE
 M:     James Hogan <james.hogan@imgtec.com>
 L:     linux-metag@vger.kernel.org