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)
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


Trivial merge