diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-14 17:51:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-14 17:51:16 -0700 |
| commit | 1bf4b1268e66d9364fc6fd41f906bc01458530ac (patch) | |
| tree | 4e7b2106d437cf011a92b91c44eb356c55c7b0ff /net/rxrpc/conn_event.c | |
| parent | 7e703eccf02a4a6aac6574f5fd4680a0619fdbfb (diff) | |
| parent | 5376366886251e2f8f248704adb620a4bc4c0937 (diff) | |
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 'net/rxrpc/conn_event.c')
0 files changed, 0 insertions, 0 deletions