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)
commit0337966d121ebebf73a1c346123e8112796e684e
treec0d4388591e72dc5a26ee976a9cbca70f6bafbbd
parent7c5bb4ac2b76d2a09256aec8a7d584bf3e2b0466
parent8a038b83e012097a7ac6cfb9f6c5fac1da8fad6e
Merge branch 'next' into for-linus

Prepare input updates for 4.12 merge window.
drivers/input/joystick/xpad.c
include/uapi/linux/Kbuild