From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Jan 2021 17:23:01 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
X-Git-Tag: v5.15~1900
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25221c99c593bf888bd8faa67ca25b40f046e9f8;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus' of git://git./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
---

25221c99c593bf888bd8faa67ca25b40f046e9f8