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)
Prepare input updates for 4.18 merge window.

1  2 
drivers/input/mouse/synaptics.c

Simple merge