Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 15 Sep 2017 16:52:21 +0000 (09:52 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 15 Sep 2017 16:52:21 +0000 (09:52 -0700)
Prepare second round of input updates for 4.14 merge window.

1  2 
drivers/input/joystick/xpad.c

Simple merge