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)
commit664b0bae0b87f69bc9deb098f5e0158b9cf18e04
treed5841492b396ff483723b9339c7c11dc33b67688
parent567b9b549cfa1cbc202762ae97b5385c29ade1e3
parent04bb1719c4de94700056241d4c0fe3c1413f5aff
Merge branch 'next' into for-linus

Prepare input updates for 4.17 merge window.
drivers/input/mouse/alps.c
drivers/input/mouse/synaptics.c
drivers/input/serio/i8042-x86ia64io.h