Merge branch 'synaptics-rmi4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 16 Dec 2016 05:36:09 +0000 (21:36 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 16 Dec 2016 05:36:09 +0000 (21:36 -0800)
commitebfb0184ef560897fad35005989e82433419202c
tree226a8195fdae6c79d90d76baa1cbdaf80f794bb0
parentf43d3ec3a889c7f6a196f3b6d6b13345ee46af8a
parent5191d88acc688743eef56f1c598a4e4cddf6c6cd
Merge branch 'synaptics-rmi4' into next

Merge updated Synaptics RMI4 support, including support for SMBus
controllers and flashing firmware.
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/input/rmi4/rmi_i2c.c
drivers/input/rmi4/rmi_spi.c
drivers/input/touchscreen/Kconfig