Merge tag 'gpio-v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 89fd804..954ba16 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5984,7 +5984,7 @@ S:        Maintained
 F:     drivers/media/rc/gpio-ir-tx.c
 
 GPIO MOCKUP DRIVER
-M:     Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
+M:     Bamvor Jian Zhang <bamv2005@gmail.com>
 R:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
@@ -5997,6 +5997,7 @@ L:        linux-gpio@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/
+F:     Documentation/driver-api/gpio/
 F:     Documentation/gpio/
 F:     Documentation/ABI/testing/gpio-cdev
 F:     Documentation/ABI/obsolete/sysfs-gpio