tree 28ec4a32732c76bb7395c9a3d99f2c70c409b013
parent fe2fd6cc346cc7199a52250e8fb594852b2a321b
parent 96fe2ab830d7dffee1b3d8abf27ced4d7d5765e7
author Linus Torvalds <torvalds@linux-foundation.org> 1237499415 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1237499415 -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 waitqueue usage in hiddev
  HID: fix incorrect free in hiddev