tree b2ab5dc5bea498368148664d226820bac9ab24f2
parent 912e7796b06fa9b1006835605e27c42e46801b8f
parent e5288eb5ea89bd82d897cb687348bc608278f920
author Linus Torvalds <torvalds@linux-foundation.org> 1241306987 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241306987 -0700

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: fix oops in hid_check_keys_pressed()
  HID: fix possible deadlock in usbhid_close()
  HID: Fix the support for apple mini aluminium keyboard
  HID: Add support for the G25 force feedback wheel in native mode
  HID: hidraw -- fix missing unlocks in unlocked_ioctl