Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Oct 2020 18:37:23 +0000 (11:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Oct 2020 18:37:23 +0000 (11:37 -0700)
commit72af7b411d50eddcfed7611c4510a62dfac3fcb9
treeeb47c8b73013633f0d52ef4d7453a5622e88ccaf
parentd43ca1386bf21b783d618e3a5f61c3b2e8759df2
parent5fc27b098dafb8e30794a9db0705074c7d766179
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "A couple more driver quirks, now enabling newer trackpoints from
  Synaptics for real"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: i8042 - add nopnp quirk for Acer Aspire 5 A515
  Input: trackpoint - enable Synaptics trackpoints