tree dd2bc31aa797cbb235fd15034b87332e30abfc0d
parent d999ade1cc86cd2951d41c11ea769cb4452c8811
parent a02dcde595f7cbd240ccd64de96034ad91cffc40
author Linus Torvalds <torvalds@linux-foundation.org> 1634525826 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1634525826 -1000

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