Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
[platform/kernel/linux-rpi.git] / MAINTAINERS
index 9a8e2c2..30aa825 100644 (file)
@@ -7432,6 +7432,13 @@ F:       fs/verity/
 F:     include/linux/fsverity.h
 F:     include/uapi/linux/fsverity.h
 
+FT260 FTDI USB-HID TO I2C BRIDGE DRIVER
+M:     Michael Zaidman <michael.zaidman@gmail.com>
+L:     linux-i2c@vger.kernel.org
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-ft260.c
+
 FUJITSU LAPTOP EXTRAS
 M:     Jonathan Woithe <jwoithe@just42.net>
 L:     platform-driver-x86@vger.kernel.org
@@ -12079,6 +12086,13 @@ S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
 F:     drivers/platform/surface/
 
+MICROSOFT SURFACE HID TRANSPORT DRIVER
+M:     Maximilian Luz <luzmaximilian@gmail.com>
+L:     linux-input@vger.kernel.org
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/surface-hid/
+
 MICROSOFT SURFACE HOT-PLUG DRIVER
 M:     Maximilian Luz <luzmaximilian@gmail.com>
 L:     platform-driver-x86@vger.kernel.org