summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-04-14 17:51:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-04-14 17:51:16 -0700
commit1bf4b1268e66d9364fc6fd41f906bc01458530ac (patch)
tree4e7b2106d437cf011a92b91c44eb356c55c7b0ff /kernel
parent7e703eccf02a4a6aac6574f5fd4680a0619fdbfb (diff)
parent5376366886251e2f8f248704adb620a4bc4c0937 (diff)
downloadlinux-stable-1bf4b1268e66d9364fc6fd41f906bc01458530ac.tar.gz
linux-stable-1bf4b1268e66d9364fc6fd41f906bc01458530ac.tar.bz2
linux-stable-1bf4b1268e66d9364fc6fd41f906bc01458530ac.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions