Merge remote-tracking branch 'input-current/for-linus'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5974a0f676d6e1b6c53a4f96256a2255c2947f87..cadf310dfa6da506a28b9d0c28fbba3e6b857746 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3378,6 +3378,7 @@ M:        Support Opensource <support.opensource@diasemi.com>
 W:     http://www.dialog-semiconductor.com/products
 S:     Supported
 F:     Documentation/hwmon/da90??
+F:     Documentation/devicetree/bindings/sound/da[79]*.txt
 F:     drivers/gpio/gpio-da90??.c
 F:     drivers/hwmon/da90??-hwmon.c
 F:     drivers/iio/adc/da91??-*.c
@@ -11174,6 +11175,12 @@ S:     Maintained
 F:     drivers/media/v4l2-core/videobuf2-*
 F:     include/media/videobuf2-*
 
+VIRTUAL SERIO DEVICE DRIVER
+M:     Stephen Chandler Paul <thatslyude@gmail.com>
+S:     Maintained
+F:     drivers/input/serio/userio.c
+F:     include/uapi/linux/userio.h
+
 VIRTIO CONSOLE DRIVER
 M:     Amit Shah <amit.shah@redhat.com>
 L:     virtualization@lists.linux-foundation.org