Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 6 Jul 2017 20:51:43 +0000 (13:51 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 6 Jul 2017 20:51:43 +0000 (13:51 -0700)
commitede2e7cdc58e1847cc73bd26b88a634631a43112
treef4582f9dc0f4ec8c06975017e036479805d77a4b
parent9768935264c4f0e4afd788a185d8e8d89c28e41d
parent65938133784a3092c61b00aa63d1830fb465c1ac
Merge branch 'next' into for-linus

Prepare input updates for 4.13 merge window.
drivers/input/misc/axp20x-pek.c
drivers/input/mouse/elantech.c