Merge branch 'psmouse' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 17 Mar 2018 17:58:05 +0000 (10:58 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 17 Mar 2018 17:58:05 +0000 (10:58 -0700)
Merge various PS/2 handling improvements.

1  2 
drivers/input/mouse/psmouse-base.c
drivers/input/mouse/synaptics.c

Simple merge
Simple merge