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

Pull input subsystem updates from Dmitry Torokhov:
 "Two new drivers for Elan hardware (for I2C touchpad and touchscreen
  found in several Chromebooks and other devices), a driver for Goodix
  touch panel, and small fixes to Cypress I2C trackpad and other input
  drivers.

  Also we switched to use __maybe_unused instead of gating suspend/
  resume code with #ifdef guards to get better compile coverage"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (27 commits)
  Input: gpio_keys - fix warning regarding uninitialized 'button' variable
  Input: add support for Elan eKTH I2C touchscreens
  Input: gpio_keys - fix warning regarding uninitialized  'irq' variable
  Input: cyapa - use 'error' for error codes
  Input: cyapa - fix resuming the device
  Input: gpio_keys - add device tree support for interrupt only keys
  Input: amikbd - allocate temporary keymap buffer on the stack
  Input: amikbd - fix build if !CONFIG_HW_CONSOLE
  Input: lm8323 - missing error check in lm8323_set_disable()
  Input: initialize device counter variables with -1
  Input: initialize input_no to -1 to avoid subtraction
  Input: i8042 - do not try to load on Intel NUC D54250WYK
  Input: atkbd - correct MSC_SCAN events for force_release keys
  Input: cyapa - switch to using managed resources
  Input: lifebook - use "static inline" instead of "inline" in lifebook.h
  Input: touchscreen - use __maybe_unused instead of ifdef around suspend/resume
  Input: mouse - use __maybe_unused instead of ifdef around suspend/resume
  Input: misc - use __maybe_unused instead of ifdef around suspend/resume
  Input: cap11xx - support for irq-active-high option
  Input: cap11xx - add support for various cap11xx devices
  ...

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 423d474,e6469ec..b1df0ad
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -47,8 -42,8 +47,9 @@@ dlink D-Link Corporatio
  dmo   Data Modul AG
  ebv   EBV Elektronik
  edt   Emerging Display Technologies
+ elan  Elan Microelectronic Corp.
  emmicro       EM Microelectronic
 +energymicro   Silicon Laboratories (formerly Energy Micro AS)
  epcos EPCOS AG
  epfl  Ecole Polytechnique Fédérale de Lausanne
  epson Seiko Epson Corp.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/input/keyboard/amikbd.c
Simple merge

diff --cc drivers/input/keyboard/gpio_keys.c
Simple merge

diff --cc drivers/input/keyboard/lpc32xx-keys.c
index 8c07937,9e9786d..265d641
--- 1/drivers/input/keyboard/lpc32xx-keys.c
--- 2/drivers/input/keyboard/lpc32xx-keys.c
+++ b/drivers/input/keyboard/lpc32xx-keys.c
@@@ -378,9 -327,9 +327,8 @@@ MODULE_DEVICE_TABLE(of, lpc32xx_kscan_m
  
  static struct platform_driver lpc32xx_kscan_driver = {
        .probe          = lpc32xx_kscan_probe,
-       .remove         = lpc32xx_kscan_remove,
        .driver         = {
                .name   = DRV_NAME,
 -              .owner  = THIS_MODULE,
                .pm     = &lpc32xx_kscan_pm_ops,
                .of_match_table = lpc32xx_kscan_match,
        }

diff --cc drivers/input/keyboard/pxa27x_keypad.c
Simple merge

diff --cc drivers/input/misc/88pm860x_onkey.c
Simple merge

diff --cc drivers/input/misc/max77693-haptic.c
Simple merge

diff --cc drivers/input/misc/max8925_onkey.c
Simple merge

diff --cc drivers/input/misc/max8997_haptic.c
Simple merge

diff --cc drivers/input/misc/palmas-pwrbutton.c
Simple merge

diff --cc drivers/input/misc/pm8xxx-vibrator.c
Simple merge

diff --cc drivers/input/misc/pmic8xxx-pwrkey.c
Simple merge

diff --cc drivers/input/misc/pwm-beeper.c
Simple merge

diff --cc drivers/input/misc/sirfsoc-onkey.c
Simple merge

diff --cc drivers/input/misc/twl4030-vibra.c
Simple merge

diff --cc drivers/input/misc/twl6040-vibra.c
Simple merge

diff --cc drivers/input/mouse/navpoint.c
Simple merge

diff --cc drivers/input/serio/altera_ps2.c
Simple merge

diff --cc drivers/input/touchscreen/ad7879.c
Simple merge

diff --cc drivers/input/touchscreen/edt-ft5x06.c
Simple merge

diff --cc drivers/input/touchscreen/ucb1400_ts.c
Simple merge