Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Sep 2009 14:51:28 +0000 (07:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Sep 2009 14:51:28 +0000 (07:51 -0700)
commit50223e486cabdcf7e540e519da1f26bab3084e5d
treec5eedda167c7ea83e342f80a9344646c7a99ba35
parente258b80e691f1f3ae83a60aa80eaf7322bd55ec4
parenta2d693cf650f000ea22351484ee66cf4c2651eef
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: Remove duplicate Kconfig entry
  HID: consolidate connect and disconnect into core code
  HID: fix non-atomic allocation in hid_input_report