Merge branch 'ib/5.17-cros-ec-keyb' into next

author Dmitry Torokhov <dmitry.torokhov@gmail.com>

Wed, 18 May 2022 22:02:27 +0000 (15:02 -0700)

committer Dmitry Torokhov <dmitry.torokhov@gmail.com>

Wed, 18 May 2022 22:02:27 +0000 (15:02 -0700)
author Dmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 18 May 2022 22:02:27 +0000 (15:02 -0700)
committer Dmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 18 May 2022 22:02:27 +0000 (15:02 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/input/keyboard/cros_ec_keyb.c
Simple merge
diff --cc drivers/input/tablet/aiptek.c
Simple merge
author	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Wed, 18 May 2022 22:02:27 +0000 (15:02 -0700)
committer	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Wed, 18 May 2022 22:02:27 +0000 (15:02 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/cros_ec_keyb.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/tablet/aiptek.c	patch \|	diff1 \|	diff2 \|	blob \| history