Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jan 2018 00:45:06 +0000 (16:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jan 2018 00:45:06 +0000 (16:45 -0800)
commit65c64d1845fbc6420f8836e8731ea6c3012e8e7d
treee7652f8508b9f1da90f234b20e17212d08d5bc0b
parent313243aa1a8c6e5ac8749338139d11ede860ae81
parent02a0d9216d4daf6a58d88642bd2da2c78c327552
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "Just a few driver fixups, nothing exciting"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xen-kbdfront - do not advertise multi-touch pressure support
  Input: hideep - fix compile error due to missing include file
  Input: elants_i2c - do not clobber interrupt trigger on x86
  Input: joystick/analog - riscv has get_cycles()
  Input: elantech - add new icbody type 15
  Input: ims-pcu - fix typo in the error message