]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Oct 2010 16:49:43 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Oct 2010 16:49:43 +0000 (09:49 -0700)
commit1bbee7d616d5fdffa6c1c86075dbffe2b3e236ea
treed4a7fd43961d1ee97b5323bfc4d75b634d317bf0
parent264780c29041a147f5cff5dda64d03373e24b972
parent272036edb77e5967c175ac48b8c88e9b3358285f
Merge branch 'upstream-fixes' of git://git./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