diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-20 11:15:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-20 11:15:46 -0800 |
| commit | 961af9dbe5d0d0f58aac989bac17279c17a43663 (patch) | |
| tree | 684d575b8bcfb1531847f24418e34165a2455d5e /lib/error-inject.c | |
| parent | 70d2bec7c545e06057c5d963b8623e6e234901e8 (diff) | |
| parent | 7b1f781f2d2460693f43d5f764198df558e3494b (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 Synaptics touchpads in RMI4 mode failing to suspend/resume
properly because I2C client devices are now being suspended and
resumed asynchronously which changed the ordering
- a change to make sure we do not set right and middle buttons
capabilities on touchpads that are "buttonpads" (i.e. do not have
separate physical buttons)
- a change to zinitix touchscreen driver adding more compatible
strings/IDs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: psmouse - set up dependency between PS/2 and SMBus companions
Input: zinitix - add new compatible strings
Input: clear BTN_RIGHT/MIDDLE on buttonpads
Diffstat (limited to 'lib/error-inject.c')
0 files changed, 0 insertions, 0 deletions