Merge branches 'ib-mfd-arm-leds-5.2', 'ib-mfd-gpio-input-leds-power-5.2', 'ib-mfd...

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2c2fce72e694f6ccc2000974e9cba4f6fcafbf48..1effe978902312b1738434ada432b6bcf0b6275d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -709,6 +709,12 @@ L: linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-altera.c
 
+ALTERA SYSTEM MANAGER DRIVER
+M:     Thor Thayer <thor.thayer@linux.intel.com>
+S:     Maintained
+F:     drivers/mfd/altera-sysmgr.c
+F:     include/linux/mfd/altera-sysgmr.h
+
 ALTERA SYSTEM RESOURCE DRIVER FOR ARRIA10 DEVKIT
 M:     Thor Thayer <thor.thayer@linux.intel.com>
 S:     Maintained
@@ -9408,6 +9414,20 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/sound/max9860.txt
 F:     sound/soc/codecs/max9860.*
 
+MAXIM MAX77650 PMIC MFD DRIVER
+M:     Bartosz Golaszewski <bgolaszewski@baylibre.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/*/*max77650.txt
+F:     Documentation/devicetree/bindings/*/max77650*.txt
+F:     include/linux/mfd/max77650.h
+F:     drivers/mfd/max77650.c
+F:     drivers/regulator/max77650-regulator.c
+F:     drivers/power/supply/max77650-charger.c
+F:     drivers/input/misc/max77650-onkey.c
+F:     drivers/leds/leds-max77650.c
+F:     drivers/gpio/gpio-max77650.c
+
 MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
 M:     Javier Martinez Canillas <javier@dowhile0.org>
 L:     linux-kernel@vger.kernel.org