]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e703ec 5376366)
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)
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

1  2 
include/uapi/linux/Kbuild patch | diff1 | diff2 | blob | history

diff --cc include/uapi/linux/Kbuild
Simple merge
XArray, radix tree and IDR