Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 13 Nov 2015 19:56:45 +0000 (11:56 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 13 Nov 2015 19:56:45 +0000 (11:56 -0800)
Prepare second round of input updates for 4.3 merge window.

1  2 
drivers/input/touchscreen/Kconfig

Simple merge