diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 17:28:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 17:28:25 -0800 |
| commit | 81bbef23db51c0b450d90607fbbc2ad80ee0d43f (patch) | |
| tree | 763e991b31dbf83ff53cf964e8b8c402069e3754 /drivers/scsi | |
| parent | 79f4d1d5c0d7d115b5a693a5bb369e69efb7e7a5 (diff) | |
| parent | 2fa299a917adb2db2d486b9e4a3072865ce70a03 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fix from Jiri Kosina:
"Regression fix for HID_RMI-driven synaptics touchpads in
!CONFIG_HID_RMI cases"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: rmi: fallback to generic/multitouch if hid-rmi is not built
Diffstat (limited to 'drivers/scsi')
0 files changed, 0 insertions, 0 deletions