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)
Prepare first round of input updates for 3.18.

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

Simple merge
Simple merge