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: (35 commits)
  Input: add driver for Synaptics I2C touchpad
  Input: synaptics - add support for reporting x/y resolution
  Input: ALPS - handle touchpoints buttons correctly
  Input: gpio-keys - change timer to workqueue
  Input: ads7846 - pin change interrupt support
  Input: add support for touchscreen on W90P910 ARM platform
  Input: appletouch - improve finger detection
  Input: wacom - clear Intuos4 wheel data when finger leaves proximity
  Input: ucb1400 - move static function from header into core
  Input: add driver for EETI touchpanels
  Input: ads7846 - more detailed model name in sysfs
  Input: ads7846 - support swapping x and y axes
  Input: ati_remote2 - use non-atomic bitops
  Input: introduce lm8323 keypad driver
  Input: psmouse - ESD workaround fix for OLPC XO touchpad
  Input: tsc2007 - make sure platform provides get_pendown_state()
  Input: uinput - flush all pending ff effects before destroying device
  Input: simplify name handling for certain input handles
  Input: serio - do not use deprecated dev.power.power_state
  Input: wacom - add support for Intuos4 tablets
  ...

diff --combined drivers/input/misc/Kconfig
index 06f46fc,4399f54..1acfa3a
--- 1/drivers/input/misc/Kconfig
--- 2/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@@ -193,6 -193,16 +193,16 @@@ config INPUT_CM10
          To compile this driver as a module, choose M here: the module will be
          called cm109.
  
+ config INPUT_TWL4030_PWRBUTTON
+       tristate "TWL4030 Power button Driver"
+       depends on TWL4030_CORE
+       help
+         Say Y here if you want to enable power key reporting via the
+         TWL4030 family of chips.
+ 
+         To compile this driver as a module, choose M here. The module will
+         be called twl4030_pwrbutton.
+ 
  config INPUT_UINPUT
        tristate "User level driver support"
        help
@@@ -232,7 -242,7 +242,7 @@@ config INPUT_GPIO_ROTARY_ENCODE
        depends on GPIOLIB && GENERIC_GPIO
        help
          Say Y here to add support for rotary encoders connected to GPIO lines.
 -        Check file:Documentation/incput/rotary_encoder.txt for more
 +        Check file:Documentation/input/rotary-encoder.txt for more
          information.
  
          To compile this driver as a module, choose M here: the
@@@ -250,4 -260,13 +260,13 @@@ config INPUT_RB532_BUTTO
          To compile this driver as a module, choose M here: the
          module will be called rb532_button.
  
+ config INPUT_DM355EVM
+       tristate "TI DaVinci DM355 EVM Keypad and IR Remote"
+       depends on MFD_DM355EVM_MSP
+       help
+         Supports the pushbuttons and IR remote used with
+         the DM355 EVM board.
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called dm355evm_keys.
  endif