Linus Torvalds efd8929b9e 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 ...		2021-04-30 12:53:02 -07:00
..
acpi	Merge branches 'acpi-cppc', 'acpi-video' and 'acpi-utils'	2021-04-26 17:04:27 +02:00
asm-generic	- removed get_fs/set_fs	2021-04-29 11:28:08 -07:00
clocksource	ARM: platform support for Apple M1	2021-04-26 12:30:36 -07:00
crypto
drm	Merge drm/drm-fixes into drm-next	2021-04-13 23:15:09 +02:00
dt-bindings	Here's a collection of largely clk driver updates for the merge window. The	2021-04-28 17:13:56 -07:00
keys	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2021-04-26 08:51:23 -07:00
kunit
kvm
linux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid	2021-04-30 12:53:02 -07:00
math-emu
media	media updates for v5.13-rc1	2021-04-28 09:24:36 -07:00
memory
misc
net	Networking changes for 5.13.	2021-04-29 11:57:23 -07:00
pcmcia
ras
rdma
scsi	SCSI misc on 20210428	2021-04-28 17:22:10 -07:00
soc	Networking changes for 5.13.	2021-04-29 11:57:23 -07:00
sound	ASoC: Updates for v5.13	2021-04-26 16:59:21 +02:00
target
trace	Networking changes for 5.13.	2021-04-29 11:57:23 -07:00
uapi	sound updates for 5.13	2021-04-30 12:48:14 -07:00
vdso
video
xen	xen/arm: introduce XENFEAT_direct_mapped and XENFEAT_not_direct_mapped	2021-04-23 11:33:50 +02:00