From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Sep 2009 14:51:28 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.32-rc1~414
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=50223e486cabdcf7e540e519da1f26bab3084e5d;p=~andy%2Flinux

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: Remove duplicate Kconfig entry
  HID: consolidate connect and disconnect into core code
  HID: fix non-atomic allocation in hid_input_report
---

50223e486cabdcf7e540e519da1f26bab3084e5d