]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Aug 2017 20:45:44 +0000 (13:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Aug 2017 20:45:44 +0000 (13:45 -0700)
commit440105d3c958cf10b5900fac9d4632d47d57a0cc
treee89313c0979b050f985f252c76ad6613cc5a91ad
parent3bc6c906eacec34f0d8dcfd3c7e4513edf152297
parent76988690402dde2880bfe06ecccf381d48ba8e1c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c - Add antoher Lenovo ACPI ID for upcoming Lenovo NB
  Input: elan_i2c - add ELAN0608 to the ACPI table
  Input: trackpoint - assume 3 buttons when buttons detection fails