From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 6 Feb 2007 22:56:37 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.21-rc1~92^2~38
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ac04a1597d9bca952dafcf8cbff4621884cb723;p=linux-2.6

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
  USB HID: handle multi-interface devices for Apple macbook pro properly
  HID: move away from DEBUG defines in favor of CONFIG_HID_DEBUG
  USB HID: fix bogus comment in hid_get_class_descriptor()
  USB HID: remove hid_find_field_by_usage()
  HID: API - fix leftovers of hidinput API in USB HID
  HID: hid debug from hid-debug.h to hid layer
  hid: force feedback driver for PantherLord USB/PS2 2in1 Adapter
  hid: quirk for multi-input devices with unneeded output reports
  hid: allow force feedback for multi-input devices
---

2ac04a1597d9bca952dafcf8cbff4621884cb723