diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-03 11:37:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-03 11:37:23 -0700 |
| commit | 72af7b411d50eddcfed7611c4510a62dfac3fcb9 (patch) | |
| tree | eb47c8b73013633f0d52ef4d7453a5622e88ccaf /include/linux/string_helpers.h | |
| parent | d43ca1386bf21b783d618e3a5f61c3b2e8759df2 (diff) | |
| parent | 5fc27b098dafb8e30794a9db0705074c7d766179 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"A couple more driver quirks, now enabling newer trackpoints from
Synaptics for real"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: i8042 - add nopnp quirk for Acer Aspire 5 A515
Input: trackpoint - enable Synaptics trackpoints
Diffstat (limited to 'include/linux/string_helpers.h')
0 files changed, 0 insertions, 0 deletions