tree 7f1f69e01c34251140024eaeea8495f4fbeb4ff6
parent fc856f1df788dc9ad13f154167ae0b442e167950
parent 179e8e47c02a1950f1c556f2b854bdb2259078fb
author Linus Torvalds <torvalds@linux-foundation.org> 1611854581 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1611854581 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

Pull HID fixes from Jiri Kosina:

 - NULL pointer dereference regression fix for Wacom driver (Jason
   Gerecke)

 - functional regression fix for pam handling on some Elan and Synaptics
   touchpads (Kai-Heng Feng)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: wacom: Correct NULL dereference on AES pen proximity
  HID: multitouch: Apply MT_QUIRK_CONFIDENCE quirk for multi-input devices