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)
commit91167e1914673972511617b6f4165bb12c3e0dcf
tree0d8d2b997d3aef7dc23eaabadef51ab29de88d23
parenta6b48699ae50ccce700506ced863ba1f5ce2af11
parent3361a97601f243f1842bee6ca709e399f47b2ce3
Merge branch 'next' into for-linus

Prepare second round of input updates for 3.17.
drivers/input/mouse/synaptics.c