commit f9ed432c929f005110c23eb00702265fc4c08e66
author Linus Torvalds <torvalds@linux-foundation.org> Fri Aug 02 14:22:15 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Aug 02 14:22:15 2013 -0700
tree 060e6787d0fe75c3a65827aaa9d51620cc3b6df7
parent 940e84fc2681d5265a602a287e0204569ca215fa
parent e6dfb04360bb265c2e931316369c877b3bb7159c

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

Pull HID fixes from Jiri Kosina:
 - fix hid-sony PS3 sixaxxis breakage from Benjamin Tissories
 - fix hidraw race condition from Yonghua Zheng
 - fix/bandaid for rare device enumeration problems of Logitech Unifying
   receivers from Nestor Lopez Casado

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hidraw: fix improper mutex release
  HID: sony: fix HID mapping for PS3 sixaxis controller
  HID: hid-logitech-dj: querying_devices was never set
  HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue""