diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-09 11:58:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-09 11:58:05 -0800 |
| commit | 99378fd26803328cbab64ae60fa98e1394d07a6d (patch) | |
| tree | 1ab2771c56963fec8669ac87c7058c84345365c4 /sound/oss/bin2hex.c | |
| parent | 189addce85330208bea50ea7f1483b58822e93cf (diff) | |
| parent | 413d37326700aaf708730b940b04192c36e13ef4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"A fix for a crash in uinput, and a fix for build errors when HID-RMI
is built-in but SERIO is a module"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics-rmi4 - select 'SERIO' when needed
Input: uinput - fix crash when mixing old and new init style
Diffstat (limited to 'sound/oss/bin2hex.c')
0 files changed, 0 insertions, 0 deletions