From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Sep 2020 17:40:43 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=376566ca87257b9116ac5205f0efaa3c0f29103b;p=linux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "Just a couple of driver quirks"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: trackpoint - add new trackpoint variant IDs
  Input: i8042 - add Entroware Proteus EL07R4 to nomux and reset lists
---

376566ca87257b9116ac5205f0efaa3c0f29103b