Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Oct 2017 16:08:56 +0000 (09:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Oct 2017 16:08:56 +0000 (09:08 -0700)
commitbe7484acc6fee2878dc8d1593ba81fb1e0b3d581
tree49d15b5652190a987e7a16019d80cc89764ef430
parent7702f47623e6c029b4ce59ce0ad39b869d5cc933
parenta0933a456ff83a3b5ffa3a1903e0b8de4a56adf5
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:

 - fix for potential out-of-bounds memory access (found by fuzzing,
   likely requires specially crafted device to trigger) by Jaejoong Kim

 - two new device IDs for elecom driver from Alex Manoussakis

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hid-elecom: extend to fix descriptor for HUGE trackball
  HID: usbhid: fix out-of-bounds bug