Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 3 Oct 2014 18:24:46 +0000 (11:24 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 3 Oct 2014 18:24:46 +0000 (11:24 -0700)
commit447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6
tree676e741f2552c9cb301e1e49c557b92bf8940f55
parent3049683eafdbbbd7350b0e5ca02a2d8c026a3362
parent042e1c79166b9250edd8262bea84e1703f27ad2e
Merge branch 'next' into for-linus

Prepare first round of input updates for 3.18.
drivers/input/mouse/psmouse-base.c
drivers/input/mouse/synaptics.c