Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 14 Nov 2017 01:10:13 +0000 (17:10 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 14 Nov 2017 01:10:13 +0000 (17:10 -0800)
commitc25141062a82ae8bddced1b3ce2b57a1c0efabe0
tree105edf10059bc0c4f2f00338b0c861b813d1bb1a
parent26dd633e437dca218547ccbeacc71fe8a620b6f6
parentc1b433e04ef9c0a1c4d65bfe918472ffa334dff4
Merge branch 'next' into for-linus

Prepare input updates for 4.15 merge window.
drivers/input/mouse/elan_i2c_core.c
drivers/input/touchscreen/tsc200x-core.c