tree c5eedda167c7ea83e342f80a9344646c7a99ba35
parent e258b80e691f1f3ae83a60aa80eaf7322bd55ec4
parent a2d693cf650f000ea22351484ee66cf4c2651eef
author Linus Torvalds <torvalds@linux-foundation.org> 1253631088 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253631088 -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: Remove duplicate Kconfig entry
  HID: consolidate connect and disconnect into core code
  HID: fix non-atomic allocation in hid_input_report