tree f98e36f3d3108344a82e9ccdb30790121ed93b5e
parent ae445b9134126314844ad9e84010bae5e6684103
parent b0e14951ee0f6c29abc64b92ec7075a159ede37c
author Linus Torvalds <torvalds@linux-foundation.org> 1255453833 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255453833 -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 possible deadlock in hidraw_read
  HID: fix kerneldoc comment for hid_input_report()
  HID: add __init/__exit macros to twinhan.c