Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Feb 2017 17:56:34 +0000 (09:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Feb 2017 17:56:34 +0000 (09:56 -0800)
commita0d5ef457393a240869d837cda1ccb22bbbe3dc2
tree0d0fe184142b5efa810e9296952aab10b5c6e79c
parent444a034d390da1b636bb2c5f02ebaa08cdbe8de1
parent722c5ac708b4f5c1fcfad5fed4c95234c8b06590
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input fix from Dmitry Torokhov:
 "Just a single change to Elan touchpad driver to recognize a new ACPI
  ID"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c - add ELAN0605 to the ACPI table