Merge branch 'for-7.2/oxp' into for-linus

author Jiri Kosina <jkosina@suse.com>

Tue, 16 Jun 2026 19:50:58 +0000 (21:50 +0200)

committer Jiri Kosina <jkosina@suse.com>

Tue, 16 Jun 2026 19:50:58 +0000 (21:50 +0200)
author Jiri Kosina <jkosina@suse.com>
Tue, 16 Jun 2026 19:50:58 +0000 (21:50 +0200)
committer Jiri Kosina <jkosina@suse.com>
Tue, 16 Jun 2026 19:50:58 +0000 (21:50 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/Makefile
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
author	Jiri Kosina <jkosina@suse.com>
	Tue, 16 Jun 2026 19:50:58 +0000 (21:50 +0200)
committer	Jiri Kosina <jkosina@suse.com>
	Tue, 16 Jun 2026 19:50:58 +0000 (21:50 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history