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

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 89e999128129a0054e088e6799a56e09d98c1f79..e32f4847e251490359d8a093796dc954add21e21 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -238,6 +238,12 @@ L: lm-sensors@lm-sensors.org
 S:     Maintained
 F:     drivers/hwmon/abituguru3.c
 
+ACCES 104-DIO-48E GPIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-104-dio-48e.c
+
 ACCES 104-IDI-48 GPIO DRIVER
 M:     "William Breathitt Gray" <vilhelm.gray@gmail.com>
 L:     linux-gpio@vger.kernel.org
@@ -4827,10 +4833,14 @@ 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/gpio/
+F:     Documentation/ABI/testing/gpio-cdev
+F:     Documentation/ABI/obsolete/sysfs-gpio
 F:     drivers/gpio/
 F:     include/linux/gpio/
 F:     include/linux/gpio.h
 F:     include/asm-generic/gpio.h
+F:     include/uapi/linux/gpio.h
+F:     tools/gpio/
 
 GRE DEMULTIPLEXER DRIVER
 M:     Dmitry Kozlov <xeb@mail.ru>
@@ -11931,6 +11941,12 @@ M:     David Härdeman <david@hardeman.nu>
 S:     Maintained
 F:     drivers/media/rc/winbond-cir.c
 
+WINSYSTEMS WS16C48 GPIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-ws16c48.c
+
 WIMAX STACK
 M:     Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:     linux-wimax@intel.com