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)
Prepare first round of input updates for 4.3 merge window.

1  2 
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/ads7846.c

Simple merge
Simple merge