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)
commita292241cccb7e20e8b997a9a44177e7c98141859
treea0b0bb95e7dce3233a2d8b203f9e326cdec7a00e
parentd49cb7aeebb974713f9f7ab2991352d3050b095b
parent68807a0c2015cb40df4869e16651f0ce5cc14d52
Merge branch 'next' into for-linus

Prepare input updates for 3.16.
drivers/input/keyboard/Kconfig
drivers/input/mouse/Kconfig
drivers/input/touchscreen/Kconfig