From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Jul 2010 21:42:21 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v3.0~4266
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=293ffa8faa21bbc5e77d3f779d95c4146ee8f709;p=platform%2Fkernel%2Flinux-amlogic.git

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: Send Report ID when numbered reports are sent over the control endpoint.
  HID: Enable HID_QUIRK_MULTI_INPUT for Retro Adaptor
  HID: add support for CH Eclipse yoke
  HID: eliminate a double lock in debug code
  HID: ntrig: add support for new firwmare versions
  HID: check for HID_QUIRK_IGNORE during probing
  HID: roccat: fix modules interdependencies
---

293ffa8faa21bbc5e77d3f779d95c4146ee8f709