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, 15 insertions, 4 deletions

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c76bd3183beb..f829998fabe6 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -196,20 +196,22 @@ config KEYBOARD_GPIO_POLLED
           module will be called gpio_keys_polled.
 
 config KEYBOARD_TCA6416
-        tristate "TCA6416 Keypad Support"
+        tristate "TCA6416/TCA6408A Keypad Support"
         depends on I2C
         help
           This driver implements basic keypad functionality
-          for keys connected through TCA6416 IO expander
+          for keys connected through TCA6416/TCA6408A IO expanders.
 
           Say Y here if your device has keys connected to
-          TCA6416 IO expander. Your board-specific setup logic
+          TCA6416/TCA6408A IO expander. Your board-specific setup logic
           must also provide pin-mask details(of which TCA6416 pins
           are used for keypad).
 
-          If enabled the complete TCA6416 device will be managed through
+          If enabled the entire TCA6416 device will be managed through
           this driver.
 
+          To compile this driver as a module, choose M here: the
+          module will be called tca6416_keypad.
 
 config KEYBOARD_MATRIX
         tristate "GPIO driven matrix keypad support"
@@ -459,6 +461,15 @@ config KEYBOARD_OMAP4
           To compile this driver as a module, choose M here: the
           module will be called omap4-keypad.
 
+config KEYBOARD_SPEAR
+        tristate "ST SPEAR keyboard support"
+        depends on PLAT_SPEAR
+        help
+          Say Y here if you want to use the SPEAR keyboard.
+
+          To compile this driver as a module, choose M here: the
+          module will be called spear-keboard.
+
 config KEYBOARD_TC3589X
         tristate "TC3589X Keypad support"
         depends on MFD_TC3589X