Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cda045337a9d319eca95e6b297d983b54085344a..04ea1f23756f1ccce4f93c5515575663ed6495ab 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6965,6 +6965,13 @@ S:       Maintained
 F:     Documentation/filesystems/ufs.txt
 F:     fs/ufs/
 
+UHID USERSPACE HID IO DRIVER:
+M:     David Herrmann <dh.herrmann@googlemail.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/uhid.c
+F:     include/linux/uhid.h
+
 ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 L:     linux-usb@vger.kernel.org
 S:     Orphan