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

Pull some more input subsystem updates from Dmitry Torokhov:
 "An update to the ALPS driver to support the V8 protocol with
  touchstick, a change for i8042 to skip selftest on many Asus laptops
  which helps to keep their touchpads working after resume, and a couple
  other driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: i8042 - skip selftest on ASUS laptops
  Input: melfas_mip4 - add ic_name sysfs attribute
  Input: melfas_mip4 - add maintainer information
  Input: melfas_mip4 - add devicetree binding documentations
  Input: elantech - add Fujitsu Lifebook E556 to force crc_enabled
  Input: synaptics-rmi4 - fix error handling in I2C transport driver
  Input: synaptics-rmi4 - fix error handling in SPI transport driver
  Input: ALPS - add V8 protocol documentation
  Input: ALPS - set DualPoint flag for 74 03 28 devices
  Input: ALPS - allow touchsticks to report pressure
  Input: ALPS - handle 0-pressure 1F events
  Input: ALPS - add touchstick support for SS5 hardware
  Input: elantech - force needed quirks on Fujitsu H760
  Input: elantech - fix Lenovo version typo

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index caf0798908e293867929716e68c6237901e383b1,1457fd4d035f43c42b9641c0efe3b4fbd932b5f4..f0a48ea78659c933839554ca879babb1b621b264
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -156,13 -137,13 +156,14 @@@ lantiq  Lantiq Semiconducto
  lenovo        Lenovo Group Ltd.
  lg    LG Corporation
  linux Linux-specific binding
 -lsi   LSI Corp. (LSI Logic)
  lltc  Linear Technology Corporation
 +lsi   LSI Corp. (LSI Logic)
  marvell       Marvell Technology Group Ltd.
  maxim Maxim Integrated Products
 +meas  Measurement Specialties
  mediatek      MediaTek Inc.
  melexis       Melexis N.V.
+ melfas        MELFAS Inc.
  merrii        Merrii Technology Co., Ltd.
  micrel        Micrel Inc.
  microchip     Microchip Technology Inc.

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
index 146d1498aa014a6ecdf073bf1b4bcea66528a8b3,c232980e65958ce310d7d6a2d6c8d54b9f8cfc9a..a452c404141dfc4607b6cf96bc600ddf7ca33b94
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7829,8 -7155,15 +7829,15 @@@ F:    Documentation/scsi/megaraid.tx
  F:    drivers/scsi/megaraid.*
  F:    drivers/scsi/megaraid/
  
+ MELFAS MIP4 TOUCHSCREEN DRIVER
+ M:    Sangwon Jee <jeesw@melfas.com>
+ W:    http://www.melfas.com
+ S:    Supported
+ F:    drivers/input/touchscreen/melfas_mip4.c
+ F:    Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt
+ 
  MELLANOX ETHERNET DRIVER (mlx4_en)
 -M:    Eugenia Emantayev <eugenia@mellanox.com>
 +M:    Tariq Toukan <tariqt@mellanox.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com