Merge branch 'for-6.3/hid-bpf' into for-linus

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1aae07c06ba15250c9758199dfdaf71ff192dc57..b14fe36db46372824798e3264d917de7ba0c689e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9207,9 +9207,12 @@ M:       Benjamin Tissoires <benjamin.tissoires@redhat.com>
 L:     linux-input@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
+F:     Documentation/hid/
 F:     drivers/hid/
 F:     include/linux/hid*
 F:     include/uapi/linux/hid*
+F:     samples/hid/
+F:     tools/testing/selftests/hid/
 
 HID LOGITECH DRIVERS
 R:     Filipe Laíns <lains@riseup.net>
@@ -9217,6 +9220,13 @@ L:       linux-input@vger.kernel.org
 S:     Maintained
 F:     drivers/hid/hid-logitech-*
 
+HID++ LOGITECH DRIVERS
+R:     Filipe Laíns <lains@riseup.net>
+R:     Bastien Nocera <hadess@hadess.net>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-logitech-hidpp.c
+
 HID PLAYSTATION DRIVER
 M:     Roderick Colenbrander <roderick.colenbrander@sony.com>
 L:     linux-input@vger.kernel.org
@@ -21730,6 +21740,7 @@ F:      include/uapi/linux/uvcvideo.h
 
 USB WEBCAM GADGET
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+M:     Daniel Scally <dan.scally@ideasonboard.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     drivers/usb/gadget/function/*uvc*