Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 4 Apr 2018 23:11:49 +0000 (16:11 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 4 Apr 2018 23:11:49 +0000 (16:11 -0700)
Prepare input updates for 4.17 merge window.

1  2 
drivers/input/mouse/alps.c
drivers/input/mouse/synaptics.c
drivers/input/serio/i8042-x86ia64io.h

Simple merge
Simple merge
Simple merge