Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Aug 2013 18:53:06 +0000 (11:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Aug 2013 18:53:06 +0000 (11:53 -0700)
commit58c59bc997d86593f0bea41845885917cf304d22
tree6828cd2526c9f4a86955389b26314819ea891213
parent78ebf0e349421156fe70f437ce6ce3daf068ef56
parent8e5654ce6914b950b42d1f896f3d8a75fbf307ae
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

Pull HID fix from Jiri Kosina:
 "Revert of a patch which breaks enumeration workaround in
  hid-logitech-dj"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  Revert "HID: hid-logitech-dj: querying_devices was never set"