linux/drivers/hid
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-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/jikos/hid 2010-12-02 17:40:04 -08:00
hid-cypress.c
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 HID: egalax: Use kzalloc 2010-11-04 11:04:44 -04: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 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-kye.c
hid-lg2ff.c
hid-lg3ff.c
hid-lg4ff.c
hid-lg.c HID: fix mismerge in hid-lg 2010-10-23 22:59:33 +02:00
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 Merge branch 'uc-logic' into for-linus 2010-10-23 22:49:32 +02:00
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 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