Merge branch 'synaptics' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 16 Mar 2015 16:12:56 +0000 (09:12 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 16 Mar 2015 16:12:56 +0000 (09:12 -0700)
commit6067fe5e0bf29f525561c8281d01011cfc9ebbd4
tree1bd13d4964140130ca28c995c7dc1196ac1f24e4
parent4eb8d6e7e5aa14572bc389e554aad9869188cdcd
parent8f004f3f4daf5dc98dc78f8e62497ad834053855
Merge branch 'synaptics' into for-linus

Bring in changes needed to properly handle Lenovo 2015 lineup.
drivers/input/mouse/synaptics.c
drivers/input/mouse/synaptics.h