]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Sep 2020 17:40:43 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Sep 2020 17:40:43 +0000 (10:40 -0700)
commit376566ca87257b9116ac5205f0efaa3c0f29103b
tree9eef2803371017e90fab333405d1a8f547d5533c
parent5868ec267de5eade3ef80bd8716d6b7621a0c4c0
parent6c77545af100a72bf5e28142b510ba042a17648d
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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