Merge branch 'uhid' into for-linus

Conflicts:
	drivers/hid/Kconfig

1 files changed, 7 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c82c343168e8..12dde1f795dd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6948,6 +6948,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