Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 May 2010 15:41:56 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 May 2010 15:41:56 +0000 (08:41 -0700)
commitf45471cbda9df24f990154a963741c9bd4c0b0aa
tree145ed5450efae53f73ae0dca263b84688d6b97ca
parent2214482cb00e6da1397c2ecde5b392490eb9637f
parent0e927bfc87037c1f44d6b61be12c36f6215ee5b2
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: roccat: fix build failure if built as module
  HID: roccat: propagate special events of roccat hardware to userspace
  HID: Add the GYR4101US USB ID to hid-gyration
  HID: fix hid-roccat-kone for bin_attr API change