Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Sep 2017 03:23:41 +0000 (17:23 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Sep 2017 03:23:41 +0000 (17:23 -1000)
commitd32e5f44a5aeb9c1febaf16db45bf888a3f66725
tree4ebd5550ea9ed5fc437233f3224fa1c0ea4e372c
parentc0a3a64e723324ae6dda53214061a71de63808c3
parent05f5c38576475439f3124a3e6d62db68de83f7be
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:

 - fixes for two long standing issues (lock up and a crash) in force
   feedback handling in uinput driver

 - tweak to firmware update timing in Elan I2C touchpad driver.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c - extend Flash-Write delay
  Input: uinput - avoid crash when sending FF request to device going away
  Input: uinput - avoid FF flush when destroying device