Merge tag 'v5.18' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 27 May 2022 23:40:01 +0000 (16:40 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 27 May 2022 23:40:01 +0000 (16:40 -0700)
Sync up with mainline to get updates to OMAP4 keypad driver and other
upstream goodies.

1  2 
drivers/input/input.c

Simple merge