Merge tag 'v4.20' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 14 Jan 2019 06:35:32 +0000 (22:35 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 14 Jan 2019 06:35:32 +0000 (22:35 -0800)
commit4116941b7a703f8c770998bb3a59966608cb5bb2
tree32945b644b69e3fd1a9ba8cd7369cf62abc44ccd
parente85bb0beb6498c0dffe18a2f1f16d575bc175c32
parent8fe28cb58bcb235034b64cbbb7550a8a43fd88be
Merge tag 'v4.20' into next

Merge with mainline to bring in the new APIs.
Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt
drivers/clk/mmp/clk-of-mmp2.c
drivers/input/misc/rotary_encoder.c
drivers/input/serio/Kconfig
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile