Merge branch 'elan-i2c' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 22 Jul 2020 02:02:33 +0000 (19:02 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 22 Jul 2020 02:02:33 +0000 (19:02 -0700)
commit9b031c86506cef9acae45e61339fcf9deaabb793
tree9095d638ba9384f86df8d61dcf1f129c082481e1
parent53aab92dec447f93489e07924e310d605a389dea
parent04d5ce620f794f1df69b5f1b9ad62910fea547f1
Merge branch 'elan-i2c' into next

Bring in update to Elan touchpad driver to support newer touchpads with
higher resolution.
MAINTAINERS
drivers/hid/hid-alps.c
drivers/hid/hid-multitouch.c
drivers/input/keyboard/Kconfig
drivers/input/mouse/elan_i2c_core.c