From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Jan 2011 22:45:47 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.38-rc1~463
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=31b6ca0af758a88e5e769b48cc6dde037ee37b96

Merge branch 'for-linus' of git://git./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
---

31b6ca0af758a88e5e769b48cc6dde037ee37b96
diff --cc drivers/input/keyboard/Kconfig
index c76bd3183beb,e98beae23cfd..f829998fabe6
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -459,16 -461,15 +461,25 @@@ config KEYBOARD_OMAP
  	  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
 +	help
 +	  Say Y here if you want to use the keypad controller on
 +	  TC35892/3 I/O expander.
 +
 +	  To compile this driver as a module, choose M here: the
 +	  module will be called tc3589x-keypad.
 +
  config KEYBOARD_TNETV107X
  	tristate "TI TNETV107X keypad support"
  	depends on ARCH_DAVINCI_TNETV107X