kevin/linux
1
Fork 0
Code
0bc6791707
linux/drivers/hid
History
Linus Torvalds 59e57c622c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: length resolution should be reported units/mm
  HID: add support for F430 Force Feedback Wheel
  HID: egalax: Use kzalloc
  HID: Remove KERN_DEBUG from dbg_hid use

Manually fixed trivial conflict in drivers/hid/hid-input.c (due to
removal of KERN_DEBUG from dbg_hid use clashing with new keycode
interface switch)
2010-12-02 17:40:04 -08:00
..
usbhid BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
hid-3m-pct.c HID: 3m: Adjust major / minor axes to scale 2010-09-22 11:29:07 +02: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: add ACRUX game controller force feedback support 2010-07-19 12:13:23 +02:00
hid-belkin.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
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: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-core.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-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 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-egalax.c HID: egalax: Use kzalloc 2010-11-04 11:04:44 -04:00
hid-elecom.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-ezkey.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-gaff.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-gyration.c HID: Add the GYR4101US USB ID to hid-gyration 2010-05-24 19:07:57 +02:00
hid-ids.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2010-10-25 07:59:01 -07: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: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
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: add driver for the Logitech Flight System G940 2010-01-13 00:26:31 +01:00
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: add driver for the Logitech Flight System G940 2010-01-13 00:26:31 +01:00
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 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-prodikeys.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-quanta.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-roccat-kone.c HID: roccat: remove obsolete kone_abi_version sysfs attribute 2010-06-21 15:20:35 +02:00
hid-roccat-kone.h HID: roccat: remove obsolete kone_abi_version sysfs attribute 2010-06-21 15:20:35 +02:00
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: roccat: fix whitespace warning from checkpatch.pl 2010-05-31 13:53:21 +02:00
hid-samsung.c HID: allow resizing and replacing report descriptors 2010-08-09 19:52:42 +02:00
hid-sjoy.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
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: add __init/__exit macros to twinhan.c 2009-09-29 13:58:20 +02:00
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 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
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 Merge branch 'waltop' into for-linus 2010-10-23 22:54:53 +02:00
Makefile Merge branch 'waltop' into for-linus 2010-10-23 22:54:53 +02:00