From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 30 Apr 2007 15:58:21 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.22-rc1~1106
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6454706c382ab74e2ecad7803c434cc6bd30343;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'for-linus' of /linux/kernel/git/jikos/hid

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: (21 commits)
  USB HID: don't warn on idVendor == 0
  USB HID: add 'quirks' module parameter
  USB HID: add support for dynamically-created quirks
  USB HID: clarify static quirk handling as squirks
  USB HID: encapsulate quirk handling into hid-quirks.c
  USB HID: EMS USBII device needs HID_QUIRK_MULTI_INPUT
  HID: update copyright and authorship macro
  HID: introduce proper zeroing of unused bits in output reports
  USB HID: add support for WiseGroup MP-8800 Quad Joypad
  USB HID: add FF support for Logitech Force 3D Pro Joystick
  USB HID: numlock quirk for dell W7658 keyboard
  USB HID: Logitech MX3000 keyboard needs report descriptor quirk
  USB HID: extend quirk for Logitech S510 keyboard
  USB HID: usbkbd/usbmouse - handle errors when registering devices
  USB HID: add QUIRK_HIDDEV for Belkin Flip KVM
  HID: enable dead keys on a belkin wireless keyboard
  USB HID: Thustmaster firestorm dual power v1 support
  USB HID: specify explicit size for hid_blacklist.quirks
  USB HID: fix retry & reset logic
  USB HID: consolidate vendor/product ids
  ...
---

d6454706c382ab74e2ecad7803c434cc6bd30343