diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-30 12:53:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-30 12:53:02 -0700 |
| commit | efd8929b9eec1cde120abb36d76dd00ff6711023 (patch) | |
| tree | b55c7ea687b952bb133485c2ec4d6c936508a64f /MAINTAINERS | |
| parent | b71428d7ab333a157216a1d73c8c82a178efada9 (diff) | |
| parent | e16e9f1184181a874cf432302ffe4689cc56b9e2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
Pull HID updates from Jiri Kosina:
- Surface Aggregator Module support from Maximilian Luz
- Apple Magic Mouse 2 support from John Chen
- Support for newer Quad/BT 2.0 Logitech receivers in HID proxy mode
from Hans de Goede
- Thinkpad X1 Tablet keyboard support from Hans de Goede
- Support for FTDI FT260 I2C host adapter from Michael Zaidman
- other various small device-specific quirks, fixes and cleanups
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (46 commits)
HID: wacom: Setup pen input capabilities to the targeted tools
HID: hid-sensor-hub: Move 'hsdev' description to correct struct definition
HID: hid-sensor-hub: Remove unused struct member 'quirks'
HID: wacom_sys: Demote kernel-doc abuse
HID: hid-sensor-custom: Remove unused variable 'ret'
HID: hid-uclogic-params: Ensure function names are present and correct in kernel-doc headers
HID: hid-uclogic-rdesc: Kernel-doc is for functions and structs
HID: hid-logitech-hidpp: Fix conformant kernel-doc header and demote abuses
HID: hid-picolcd_core: Remove unused variable 'ret'
HID: hid-kye: Fix incorrect function name for kye_tablet_enable()
HID: hid-core: Fix incorrect function name in header
HID: hid-alps: Correct struct misnaming
HID: usbhid: hid-pidff: Demote a couple kernel-doc abuses
HID: usbhid: Repair a formatting issue in a struct description
HID: hid-thrustmaster: Demote a bunch of kernel-doc abuses
HID: input: map battery capacity (00850065)
HID: magicmouse: fix reconnection of Magic Mouse 2
HID: magicmouse: fix 3 button emulation of Mouse 2
HID: magicmouse: add Apple Magic Mouse 2 support
HID: lenovo: Add support for Thinkpad X1 Tablet Thin keyboard
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9a8e2c2c706c..30aa8253bf3a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 |