Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 3 Nov 2015 22:45:16 +0000 (14:45 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 3 Nov 2015 22:45:16 +0000 (14:45 -0800)
commit84a73014d86fd660822a20c032625e3afe99ca58
tree9e42a2d3c40730947ae18363d00e8a0ee2743792
parent195562194aad3a0a3915941077f283bcc6347b9b
parentbf5f18d708802737fa0db6306f6b9148f85b2efd
Merge branch 'next' into for-linus

Prepare first round of input updates for 4.3 merge window.
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/ads7846.c