Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Mar 2009 21:50:15 +0000 (14:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Mar 2009 21:50:15 +0000 (14:50 -0700)
commit2d8620cb880c796c9a9b59fe8d4ff37d726acfea
tree28ec4a32732c76bb7395c9a3d99f2c70c409b013
parentfe2fd6cc346cc7199a52250e8fb594852b2a321b
parent96fe2ab830d7dffee1b3d8abf27ced4d7d5765e7
Merge branch 'for-linus' of git://git./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