Merge branch 'ib-chrome-platform-atmel-mxt-ts-device-properties' of git://git.kernel...
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 May 2018 16:31:25 +0000 (09:31 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 May 2018 16:31:25 +0000 (09:31 -0700)
commiteffca7bdb3503519422f2fba5961759c0ea2ffce
tree1e800be56c7e58d9db6f58e6523cc1244be23b1a
parent754451342fc5954061ede74b0a8485ec4a4c6eaa
parent5020cd29d8bfcb3f3add43ea7d58b07011ab96d8
Merge branch 'ib-chrome-platform-atmel-mxt-ts-device-properties' of git://git./linux/kernel/git/bleung/chrome-platform into next

Sync up with chrome-platform again to bring in device properties for
Atmel touch controllers incompletely described in ACPI.