Merge branch 'ib-chrome-platform-input-atmel-mx-ts-platform-removal' of git://git...
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 23 Apr 2018 23:07:15 +0000 (16:07 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 23 Apr 2018 23:07:15 +0000 (16:07 -0700)
Sync up with chrome-platform to bring in changes to Atmel touch
controller.

1  2 
drivers/input/mouse/synaptics.c

Simple merge