From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 May 2010 15:41:56 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.35-rc1~252
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=f45471cbda9df24f990154a963741c9bd4c0b0aa;p=net-next-2.6.git

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: 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
---

f45471cbda9df24f990154a963741c9bd4c0b0aa