linux/drivers/input/keyboard
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
..
aaed2000_kbd.c
adp5520-keys.c
adp5588-keys.c
amikbd.c
atakbd.c
atkbd.c
bf54x-keys.c
davinci_keyscan.c
ep93xx_keypad.c
gpio_keys.c
gpio_keys_polled.c Input: add input driver for polled GPIO buttons 2010-12-06 17:15:15 -08:00
hil_kbd.c
hilkbd.c
hpps2atkbd.h
imx_keypad.c
jornada680_kbd.c
jornada720_kbd.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
lkkbd.c
lm8323.c
locomokbd.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
maple_keyb.c
matrix_keypad.c
max7359_keypad.c
mcs_touchkey.c
newtonkbd.c
nomadik-ske-keypad.c
omap-keypad.c Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
omap4-keypad.c
opencores-kbd.c
pxa27x_keypad.c
pxa930_rotary.c
qt2160.c
samsung-keypad.c
sh_keysc.c
spear-keyboard.c
stmpe-keypad.c
stowaway.c
sunkbd.c
tc3589x-keypad.c input/tc3589x: fix compile error 2011-01-07 12:44:45 -08:00
tca6416-keypad.c Input: tca6416-keypad - add support for tca6408a 2010-12-07 21:10:28 -08:00
tnetv107x-keypad.c
twl4030_keypad.c
w90p910_keypad.c
xtkbd.c