tree fffbf36db9260e4e6d0a8e8a286a082c5c94ad04
parent 077b20537cdd4983cf180b3a3230157f08f16928
parent 6debce6f4e787a8eb4cec94e7afa85fb4f40db27
author Linus Torvalds <torvalds@linux-foundation.org> 1437767064 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1437767064 -0700

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

Pull HID fixes from Jiri Kosina:

 - kernel crash fixes for multitouch and wacom drivers, by Brent Adam
   and Dan Carpenter

 - cp2112 data packet race condition corruption fix, by Antonio Borneo

 - a few new device IDs for wacom and microsoft drivers

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: cp2112: fix to force single data-report reply
  HID: wacom: Enable pad device for older Bamboo Touch tablets
  HID: multitouch: Fix fields from pen report ID being interpreted for multitouch
  HID: microsoft: Add quirk for MS Surface Type/Touch cover
  HID: wacom: NULL dereferences on error in probe()