tree b3e8e450fdcc07dd1ed92fac9cc712870f2ca2dc
parent 33dd94ae1ccbfb7bf0fb6c692bc3d1c4269e6177
parent 83ed79c561da20019cb24944f535530d73b2d615
author Linus Torvalds <torvalds@linux-foundation.org> 1291340404 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1291340404 -0800

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)