From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Aug 2010 22:29:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.36-rc2~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1126ad907ce197ff45fbc2369fbeaf8ae6f75a8;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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:
  USB HID: Add ID for eGalax Multitouch used in JooJoo tablet
  HID: hiddev: fix memory corruption due to invalid intfdata
  HID: hiddev: protect against disconnect/NULL-dereference race
  HID: picolcd: correct ordering of framebuffer freeing
  HID: picolcd: testing the wrong variable
---

d1126ad907ce197ff45fbc2369fbeaf8ae6f75a8