Merge tag 'v5.4-rc5' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 27 Oct 2019 18:00:19 +0000 (11:00 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 27 Oct 2019 18:00:19 +0000 (11:00 -0700)
Sync up with mainline.

1  2 
Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
drivers/input/keyboard/Kconfig

Simple merge