Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Oct 2009 17:10:33 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Oct 2009 17:10:33 +0000 (10:10 -0700)
commit03266d28ca5bf1959ee91dc6554c01b790975352
treef98e36f3d3108344a82e9ccdb30790121ed93b5e
parentae445b9134126314844ad9e84010bae5e6684103
parentb0e14951ee0f6c29abc64b92ec7075a159ede37c
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 possible deadlock in hidraw_read
  HID: fix kerneldoc comment for hid_input_report()
  HID: add __init/__exit macros to twinhan.c
drivers/hid/hidraw.c