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)
commita6cbfa1e6d38c4b3ab0ce7e3aea4bb4e744f24b8
tree8960e571a398b5d32e72bdb9c89ce965daa870ab
parentf5308d1b83eba20e69df5e0926ba7257c8dd9074
parent08d6ac9ee5fedd82040bc878705981b67a116a3f
Merge branch 'next' into for-linus

Prepare input updates for 4.14 merge window.
drivers/input/joystick/xpad.c
drivers/input/mouse/elan_i2c_core.c