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: (58 commits)
  Input: wacom_w8001 - support pen or touch only devices
  Input: wacom_w8001 - use __set_bit to set keybits
  Input: bu21013_ts - fix misuse of logical operation in place of bitop
  Input: i8042 - add Acer Aspire 5100 to the Dritek list
  Input: wacom - add support for digitizer in Lenovo W700
  Input: psmouse - disable the synaptics extension on OLPC machines
  Input: psmouse - fix up Synaptics comment
  Input: synaptics - ignore bogus mt packet
  Input: synaptics - add multi-finger and semi-mt support
  Input: synaptics - report clickpad property
  input: mt: Document interface updates
  Input: fix double equality sign in uevent
  Input: introduce device properties
  hid: egalax: Add support for Wetab (726b)
  Input: include MT library as source for kerneldoc
  MAINTAINERS: Update input-mt entry
  hid: egalax: Add support for Samsung NB30 netbook
  hid: egalax: Document the new devices in Kconfig
  hid: egalax: Add support for Wetab
  hid: egalax: Convert to MT slots
  ...

Fixed up trivial conflict in drivers/input/keyboard/Kconfig

1 files changed, 24 insertions, 0 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index c1a81bcdb319..b0c6772851a9 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -430,4 +430,28 @@ config INPUT_ADXL34X_SPI
           To compile this driver as a module, choose M here: the
           module will be called adxl34x-spi.
 
+config INPUT_CMA3000
+        tristate "VTI CMA3000 Tri-axis accelerometer"
+        help
+          Say Y here if you want to use VTI CMA3000_D0x Accelerometer
+          driver
+
+          This driver currently only supports I2C interface to the
+          controller. Also select the I2C method.
+
+          If unsure, say N
+
+          To compile this driver as a module, choose M here: the
+          module will be called cma3000_d0x.
+
+config INPUT_CMA3000_I2C
+        tristate "Support I2C bus connection"
+        depends on INPUT_CMA3000 && I2C
+        help
+          Say Y here if you want to use VTI CMA3000_D0x Accelerometer
+          through I2C interface.
+
+          To compile this driver as a module, choose M here: the
+          module will be called cma3000_d0x_i2c.
+
 endif