Linus Torvalds 31b6ca0af7 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		2011-01-07 14:45:47 -08:00
..
include/plat	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
clock.c	ARM: 6014/1: ST SPEAr: Added clock framework for SPEAr platform and machines	2010-04-14 11:34:33 +01:00
Kconfig
Makefile	ARM: 6091/1: ST SPEAr: Adding support for shared irq layer	2010-05-04 16:54:54 +01:00
padmux.c	arm: plat-spear: fix typo in kerneldoc	2010-07-19 11:04:14 +02:00
shirq.c	ARM: 6091/1: ST SPEAr: Adding support for shared irq layer	2010-05-04 16:54:54 +01:00
time.c	ARM: spear: update clock source registration	2010-12-22 22:44:40 +00:00