diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-17 16:57:06 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-17 16:57:06 -1000 |
| commit | 12dbbfadd8f4e54607463414b06f9416a5c6d981 (patch) | |
| tree | dd2bc31aa797cbb235fd15034b87332e30abfc0d /lib | |
| parent | Merge tag 'perf-tools-fixes-for-v5.15-2021-10-16' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux (diff) | |
| parent | Input: touchscreen - avoid bitwise vs logical OR warning (diff) | |
| download | linux-dev-12dbbfadd8f4e54607463414b06f9416a5c6d981.tar.xz linux-dev-12dbbfadd8f4e54607463414b06f9416a5c6d981.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
- a new product ID for the xpad joystick driver
- fixes to resistive-adc-touch and snvs_pwrkey drivers
- a change to touchscreen helpers to make clang happier
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: touchscreen - avoid bitwise vs logical OR warning
Input: xpad - add support for another USB ID of Nacon GC-100
Input: resistive-adc-touch - fix division by zero error on z1 == 0
Input: snvs_pwrkey - add clk handling
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions