From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 27 May 2022 23:40:01 +0000 (-0700)
Subject: Merge tag 'v5.18' into next
X-Git-Tag: baikal/mips/sdk6.1~5047^2^2~55
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=40db02431b9fefff6b1663db30e1c13c9fef66f1;p=kernel.git

Merge tag 'v5.18' into next

Sync up with mainline to get updates to OMAP4 keypad driver and other
upstream goodies.
---

40db02431b9fefff6b1663db30e1c13c9fef66f1