tree 008e7f07904c8b70c0bacab622fe11edcc7ebf8b
parent 4a1cc2e879c9fdfe1137060ce6de3bbe413630f6
parent a9ce7856cad1bf43de5c43888e4076e77371d51b
author Linus Torvalds <torvalds@linux-foundation.org> 1484848198 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1484848198 -0800

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

Pull HID fixes from Jiri Kosina:

 - regression fix for generic Wacom devices, from Jason Gerecke

 - DMA-on-stack fixes for hid-corsair driver, from Johan Hovold

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wacom: Fix sibling detection regression
  HID: corsair: fix control-transfer error handling
  HID: corsair: fix DMA buffers on stack