tree e2f71a4f3aa209afac3009ffe9de2985ad477fe3
parent 441f4058a04b2943685ff94e0f5f1992b0b3649e
parent e639ba481b76e445df354acd6e29d859a9b1657f
author Linus Torvalds <torvalds@linux-foundation.org> 1268956351 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1268956351 -0700

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: avoid '\0' in hid debugfs events file
  HID: Add RGT Clutch Wheel clutch device id
  HID: ntrig: fix touch events
  HID: add quirk for UC-Logik WP4030 tablet
  HID: magicmouse: fix oops after device removal