diff options
| author | Linus Torvalds <[email protected]> | 2017-02-09 19:58:05 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-02-09 19:58:05 +0000 |
| commit | 99378fd26803328cbab64ae60fa98e1394d07a6d (patch) | |
| tree | 1ab2771c56963fec8669ac87c7058c84345365c4 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | Merge tag 'vfio-v4.10-final' of git://github.com/awilliam/linux-vfio (diff) | |
| parent | Input: synaptics-rmi4 - select 'SERIO' when needed (diff) | |
| download | kernel-99378fd26803328cbab64ae60fa98e1394d07a6d.tar.gz kernel-99378fd26803328cbab64ae60fa98e1394d07a6d.zip | |
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 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
0 files changed, 0 insertions, 0 deletions