Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 8 Jun 2014 06:24:07 +0000 (23:24 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 8 Jun 2014 06:24:07 +0000 (23:24 -0700)
Prepare input updates for 3.16.

1  2 
drivers/input/keyboard/Kconfig
drivers/input/mouse/Kconfig
drivers/input/touchscreen/Kconfig

Simple merge
Simple merge
Simple merge