Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2014 18:06:02 +0000 (10:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2014 18:06:02 +0000 (10:06 -0800)
commitd797da41b2aceed5daa8cd2eee92cd74b2a0c652
treef4de7daf5a81f425c057dd5a65a0e1b8056de5a9
parentd6666be6f0c43efb9475d1d35fbef9f8be61b7b1
parentf20c86cd75f1c8c728dafd0218645ff3c5e8545d
Merge branch 'for-linus' of git://git./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
  ...
22 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
drivers/input/keyboard/amikbd.c
drivers/input/keyboard/gpio_keys.c
drivers/input/keyboard/lpc32xx-keys.c
drivers/input/keyboard/pxa27x_keypad.c
drivers/input/misc/88pm860x_onkey.c
drivers/input/misc/max77693-haptic.c
drivers/input/misc/max8925_onkey.c
drivers/input/misc/max8997_haptic.c
drivers/input/misc/palmas-pwrbutton.c
drivers/input/misc/pm8xxx-vibrator.c
drivers/input/misc/pmic8xxx-pwrkey.c
drivers/input/misc/pwm-beeper.c
drivers/input/misc/sirfsoc-onkey.c
drivers/input/misc/twl4030-vibra.c
drivers/input/misc/twl6040-vibra.c
drivers/input/mouse/navpoint.c
drivers/input/serio/altera_ps2.c
drivers/input/touchscreen/ad7879.c
drivers/input/touchscreen/edt-ft5x06.c
drivers/input/touchscreen/ucb1400_ts.c