linux/drivers/hid
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
..
usbhid BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
hid-3m-pct.c input: mt: Move tracking and pointer emulation to input-mt 2010-12-16 10:41:38 +01:00
hid-a4tech.c
hid-apple.c
hid-axff.c
hid-belkin.c
hid-cando.c
hid-cherry.c
hid-chicony.c
hid-core.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2011-01-07 14:45:47 -08:00
hid-cypress.c
hid-debug.c
hid-drff.c
hid-egalax.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2011-01-07 14:45:47 -08:00
hid-elecom.c
hid-ezkey.c
hid-gaff.c
hid-gyration.c
hid-ids.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2011-01-07 14:45:47 -08:00
hid-input.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 2010-12-02 17:40:04 -08:00
hid-kensington.c
hid-kye.c
hid-lg2ff.c
hid-lg3ff.c
hid-lg4ff.c
hid-lg.c
hid-lg.h
hid-lgff.c
hid-magicmouse.c
hid-microsoft.c
hid-monterey.c
hid-mosart.c
hid-ntrig.c
hid-ortek.c
hid-petalynx.c
hid-picolcd.c
hid-pl.c
hid-prodikeys.c
hid-quanta.c
hid-roccat-kone.c
hid-roccat-kone.h
hid-roccat-pyra.c
hid-roccat-pyra.h
hid-roccat.c
hid-roccat.h
hid-samsung.c
hid-sjoy.c
hid-sony.c
hid-stantum.c
hid-sunplus.c
hid-tmff.c HID: add support for F430 Force Feedback Wheel 2010-11-29 17:41:23 +01:00
hid-topseed.c
hid-twinhan.c
hid-uclogic.c
hid-wacom.c
hid-waltop.c
hid-zpff.c
hid-zydacron.c
hidraw.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
Kconfig hid: egalax: Document the new devices in Kconfig 2010-12-16 11:32:21 +01:00
Makefile