Merge tag 'v3.17' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 11 Oct 2014 18:34:07 +0000 (11:34 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 11 Oct 2014 18:34:07 +0000 (11:34 -0700)
commit9d93551188069a0a21e664b4bfc89ed4a6df1903
treebcf7334c0e57323a6844b8147ce1c92180fe8cef
parentdd4cae8bf16611053ee7b00e20aa4fa945b92b99
parentbfe01a5ba2490f299e1d2d5508cbbbadd897bbe9
Merge tag 'v3.17' into next

Synchronize with mainline to bring in changes to Synaptics and i8042
drivers.
drivers/input/mouse/psmouse-base.c
drivers/input/mouse/synaptics.c