Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 4 Mar 2019 07:14:44 +0000 (23:14 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 4 Mar 2019 07:14:44 +0000 (23:14 -0800)
Prepare input updates for 5.1 merge window.

1  2 
drivers/input/keyboard/qt2160.c
drivers/input/touchscreen/Kconfig

Simple merge
Simple merge