Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 15 Aug 2014 06:02:58 +0000 (23:02 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 15 Aug 2014 06:02:58 +0000 (23:02 -0700)
Prepare second round of input updates for 3.17.

1  2 
drivers/input/mouse/synaptics.c

Simple merge