From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 May 2017 23:45:13 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: MMI-PSA29.97-13-9~5528
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c86daad2c25bfd4a33d48b7691afaa96d9c5ab46;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input layer fixes from Dmitry Torokhov:
 "Just a few fixups to a couple of drivers"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c - ignore signals when finishing updating firmware
  Input: elan_i2c - clear INT before resetting controller
  Input: atmel_mxt_ts - add T100 as a readable object
  Input: edt-ft5x06 - increase allowed data range for threshold parameter
---

c86daad2c25bfd4a33d48b7691afaa96d9c5ab46