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
..
88pm860x_onkey.c
ab8500-ponkey.c
ad714x-i2c.c
ad714x-spi.c
ad714x.c
ad714x.h
adxl34x-i2c.c
adxl34x-spi.c
adxl34x.c
adxl34x.h
apanel.c
ati_remote2.c
ati_remote.c
atlas_btns.c
bfin_rotary.c
cm109.c
cma3000_d0x_i2c.c	Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLE	2010-12-07 22:13:40 -08:00
cma3000_d0x.c	Input: add CMA3000 accelerometer driver	2010-11-30 23:05:21 -08:00
cma3000_d0x.h	Input: add CMA3000 accelerometer driver	2010-11-30 23:05:21 -08:00
cobalt_btns.c
dm355evm_keys.c
hp_sdc_rtc.c
ixp4xx-beeper.c
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
keyspan_remote.c
m68kspkr.c
Makefile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
max8925_onkey.c
pcap_keys.c
pcf8574_keypad.c	Input: pcf_keypad - convert to dev_op_ops	2010-11-11 22:02:57 -08:00
pcf50633-input.c
pcspkr.c
powermate.c
pwm-beeper.c
rb532_button.c
rotary_encoder.c
sgi_btns.c
sparcspkr.c
twl4030-pwrbutton.c
twl4030-vibra.c
uinput.c	Input: introduce device properties	2010-12-20 09:37:33 +01:00
wistron_btns.c
wm831x-on.c
yealink.c
yealink.h