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)
Synchronize with mainline to bring in changes to Synaptics and i8042
drivers.


Trivial merge