Merge tag 'v6.4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 17 Jul 2023 16:20:46 +0000 (09:20 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 17 Jul 2023 16:20:46 +0000 (09:20 -0700)
Sync up with mainline to bring in updates to shared infrastructure.

1  2 
MAINTAINERS
drivers/input/input.c
drivers/input/joystick/xpad.c
drivers/input/touchscreen/cyttsp5.c
drivers/input/touchscreen/goodix.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge