Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Apr 2017 00:51:16 +0000 (17:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Apr 2017 00:51:16 +0000 (17:51 -0700)
commit1bf4b1268e66d9364fc6fd41f906bc01458530ac
tree4e7b2106d437cf011a92b91c44eb356c55c7b0ff
parent7e703eccf02a4a6aac6574f5fd4680a0619fdbfb
parent5376366886251e2f8f248704adb620a4bc4c0937
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "Just a small update to xpad driver to recognize yet another gamepad,
  and another change making sure userio.h is exported"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - add support for Razer Wildcat gamepad
  uapi: add missing install of userio.h
include/uapi/linux/Kbuild