Merge tag 'v5.12' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 25 May 2021 18:24:42 +0000 (11:24 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 25 May 2021 18:24:42 +0000 (11:24 -0700)
Sync up with mainline to get the latest device tree bindings and kernel
APIs.

1  2 
MAINTAINERS
drivers/input/touchscreen/elants_i2c.c

diff --cc MAINTAINERS
Simple merge