kevin/linux
1
Fork 0
Code
eba46030e1
linux/drivers/hid
History
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: fix A4Tech RP-649 horizontal scrollwheel 2010-09-17 20:42:42 +02:00
hid-apple.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-axff.c
hid-belkin.c
hid-cando.c HID: Add Cando touch screen 15.6-inch product id 2010-10-13 10:47:32 +02:00
hid-cherry.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
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: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-debug.c Merge branches 'upstream' and 'upstream-fixes' into for-linus 2010-10-23 22:44:36 +02:00
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: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
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: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-lg2ff.c HID: force feedback support for Logitech RumblePad gamepad 2010-10-04 15:39:53 +02:00
hid-lg3ff.c
hid-lg4ff.c HID: Add support for Logitech Speed Force Wireless gaming wheel 2010-09-22 13:25:39 +02:00
hid-lg.c HID: fix mismerge in hid-lg 2010-10-23 22:59:33 +02:00
hid-lg.h HID: Add support for Logitech Speed Force Wireless gaming wheel 2010-09-22 13:25:39 +02:00
hid-lgff.c
hid-magicmouse.c HID: magicmouse: Adjust major / minor axes to scale 2010-10-01 15:42:47 +02:00
hid-microsoft.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-monterey.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-mosart.c HID: add device ID for new Asus Multitouch Controller 2010-09-08 14:30:35 +02:00
hid-ntrig.c HID: ntrig: identify firmware version 2010-09-08 11:46:19 +02:00
hid-ortek.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-petalynx.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-picolcd.c HID: picolcd: correct ordering of framebuffer freeing 2010-08-06 14:53:10 +02:00
hid-pl.c
hid-prodikeys.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-quanta.c
hid-roccat-kone.c
hid-roccat-kone.h
hid-roccat-pyra.c HID: roccat: Normalized reported profile number for pyra button events. 2010-09-01 12:42:23 +02:00
hid-roccat-pyra.h HID: roccat: add driver for Roccat Pyra mouse 2010-09-01 12:41:17 +02:00
hid-roccat.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
hid-roccat.h
hid-samsung.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-sjoy.c
hid-sony.c Merge branch 'uc-logic' into for-linus 2010-10-23 22:49:32 +02:00
hid-stantum.c HID: support STmicroelectronics and Sitronix with hid-stantuml driver 2010-10-01 16:01:34 +02:00
hid-sunplus.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-tmff.c HID: add support for F430 Force Feedback Wheel 2010-11-29 17:41:23 +01:00
hid-topseed.c HID: add support for another BTC Emprex remote control 2010-08-30 15:43:25 +02:00
hid-twinhan.c
hid-uclogic.c HID: uclogic: add proper support for PF1209 2010-08-23 15:08:42 +02:00
hid-wacom.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2010-08-10 15:08:02 -07:00
hid-waltop.c HID: waltop: add support for Waltop Slim Tablet 12.1 inch 2010-10-01 15:34:05 +02:00
hid-zpff.c
hid-zydacron.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
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 Merge branch 'waltop' into for-linus 2010-10-23 22:54:53 +02:00