commit 5884c40668a928bba017eaf54e2eb3c01c8a98e6
author Linus Torvalds <torvalds@woody.linux-foundation.org> Fri May 11 09:56:05 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri May 11 09:56:05 2007 -0700
tree 240bdf1b015f0bc2ce8c1811bd0b528c1ef386c2
parent ee54d2d87a8158d14434c1a3274bd7f713105836
parent cdcb44e87bedcf5070eece61f89f9373a3810031

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

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
  USB HID: hiddev - fix race between hiddev_send_event() and hiddev_release()
  HID: add hooks for getkeycode() and setkeycode() methods
  HID: switch to using input_dev->dev.parent
  USB HID: Logitech wheel 0x046d/0xc294 needs HID_QUIRK_NOGET quirk
  USB HID: usb_buffer_free() cleanup
  USB HID: report descriptor of Cypress USB barcode readers needs fixup
  Bluetooth HID: HIDP - don't initialize force feedback
  USB HID: update CONFIG_USB_HIDINPUT_POWERBOOK description
  HID: add input mappings for non-working keys on Logitech S510 remote