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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: add driver for Atmel AT42QT2160 Sensor Chip
  Input: max7359 - use threaded IRQs
  Input: add driver for Maxim MAX7359 key switch controller
  Input: add driver for ADP5588 QWERTY I2C Keypad
  Input: add touchscreen driver for MELFAS MCS-5000 controller
  Input: add driver for OpenCores Keyboard Controller
  Input: dm355evm_keys - remove dm355evm_keys_hardirq
  Input: synaptics_i2c - switch to using __cancel_delayed_work()
  Input: ad7879 - add support for AD7889
  Input: atkbd - rely on input core to restore state on resume
  Input: add generic suspend and resume for input devices
  Input: libps2 - additional locking for i8042 ports

diff --cc drivers/input/input.c
index 556539d,b8ed429..e828aab
--- 1/drivers/input/input.c
--- 2/drivers/input/input.c
+++ b/drivers/input/input.c
@@@ -1263,9 -1322,12 +1322,12 @@@ static struct device_type input_dev_typ
        .groups         = input_dev_attr_groups,
        .release        = input_dev_release,
        .uevent         = input_dev_uevent,
+ #ifdef CONFIG_PM
+       .pm             = &input_dev_pm_ops,
+ #endif
  };
  
 -static char *input_nodename(struct device *dev)
 +static char *input_devnode(struct device *dev, mode_t *mode)
  {
        return kasprintf(GFP_KERNEL, "input/%s", dev_name(dev));
  }

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

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

diff --cc drivers/input/touchscreen/Makefile
Simple merge

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