Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 2 May 2017 16:48:26 +0000 (09:48 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 2 May 2017 16:48:26 +0000 (09:48 -0700)
Prepare input updates for 4.12 merge window.

1  2 
drivers/input/joystick/xpad.c
include/uapi/linux/Kbuild

Simple merge
Simple merge