Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 4 Sep 2017 16:22:54 +0000 (09:22 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 4 Sep 2017 16:22:54 +0000 (09:22 -0700)
Prepare input updates for 4.14 merge window.

1  2 
drivers/input/joystick/xpad.c
drivers/input/mouse/elan_i2c_core.c

Simple merge
Simple merge