]> git.baikalelectronics.ru Git - kernel.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)
commit362ad8e23a6a0979a7cb56d6d7183377af7540f3
treed4a7fd43961d1ee97b5323bfc4d75b634d317bf0
parenta959b4d249558bcb73d282915ddffd350dbfc56f
parent254243bb07a849fc650e2d293f47dce0ad8efc69
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