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)
Prepare input updates for 4.13 merge window.

1  2 
drivers/input/misc/axp20x-pek.c
drivers/input/mouse/elantech.c

Simple merge
Simple merge