From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Oct 2010 16:49:43 +0000 (-0700)
Subject: Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.36~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1bbee7d616d5fdffa6c1c86075dbffe2b3e236ea;p=~emulex%2Finfiniband.git

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Add Cando touch screen 15.6-inch product id
  HID: Add MULTI_INPUT quirk for turbox/mosart touchscreen
  HID: hidraw, fix a NULL pointer dereference in hidraw_write
  HID: hidraw, fix a NULL pointer dereference in hidraw_ioctl
---

1bbee7d616d5fdffa6c1c86075dbffe2b3e236ea