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

Pull input updates from Dmitry Torokhov:

 - a new driver for the Azoteq IQS269A capacitive touch controller

 - a new driver for the Cypress CY8CTMA140 touchscreen

 - updates to Elan and ft5x06 touchscreen drivers

 - assorted driver fixes

 - msm-vibrator has been removed as we have a more generic solution

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (28 commits)
  Input: adi - work around module name confict
  Input: iqs269a - add missing I2C dependency
  Input: elants - refactor elants_i2c_execute_command()
  Input: elants - override touchscreen info with DT properties
  Input: elants - remove unused axes
  Input: add support for Azoteq IQS269A
  dt-bindings: input: Add bindings for Azoteq IQS269A
  Input: imx_sc_key - use devm_add_action_or_reset() to handle all cleanups
  Input: remove msm-vibrator driver
  dt-bindings: Input: remove msm-vibrator
  Input: elants_i2c - provide an attribute to show calibration count
  Input: introduce input_mt_report_slot_inactive()
  dt-bindings: input: touchscreen: elants_i2c: convert to YAML
  Input: add driver for the Cypress CY8CTMA140 touchscreen
  dt-bindings: touchscreen: Add CY8CTMA140 bindings
  Input: edt-ft5x06 - prefer asynchronous probe
  Input: edt-ft5x06 - improve power management operations
  Input: edt-ft5x06 - move parameter restore into helper
  Input: edt-ft5x06 - fix get_default register write access
  Input: atkbd - receive and use physcode->keycode mapping from FW
  ...

diff --cc MAINTAINERS
index 12dd77fb4e4e570ae8e8c85210761c32265cdb6c,2c79dc3422f1f9b873689f1e86c430c4005559e2..9b4e836543a372f4e20a04cc5ae5f8ee9108be1e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4708,8 -4625,15 +4708,14 @@@ W:    https://linuxtv.or
  W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
 -S:    Maintained
  F:    drivers/media/common/cypress_firmware*
  
+ CYPRESS CY8CTMA140 TOUCHSCREEN DRIVER
+ M:    Linus Walleij <linus.walleij@linaro.org>
+ L:    linux-input@vger.kernel.org
+ S:    Maintained
+ F:    drivers/input/touchscreen/cy8ctma140.c
+ 
  CYTTSP TOUCHSCREEN DRIVER
  M:    Ferruh Yigit <fery@cypress.com>
  L:    linux-input@vger.kernel.org

diff --cc drivers/hid/hid-alps.c
Simple merge

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge