Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 4 Jun 2018 20:33:12 +0000 (13:33 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 4 Jun 2018 20:33:12 +0000 (13:33 -0700)
commitc13aca79ff3c4af5fd31a5b2743a90eba6e36a26
tree8f77894f61822d1ae5285c07c801af7c62f71afd
parent40f7090bb1b4ec327ea1e1402ff5783af5b35195
parent5ca4d1ae9bad0f59bd6f851c39b19f5366953666
Merge branch 'next' into for-linus

Prepare input updates for 4.18 merge window.
drivers/input/mouse/synaptics.c