tree 0c0a5dfa418127e316d80fad8c721fe734e059c4
parent 2b9bea035a488774b176f14f53160442e8906ad8
parent 0be017120b80f0fe3da9a8239f989a27e54828f2
author Linus Torvalds <torvalds@linux-foundation.org> 1439245008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1439245008 -0700

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

Pull HID fixes from Jiri Kosina:

 - fix for bounds limit calculation in uclogic driver, by Dan Carpenter

 - fix for use-after-free during device removal, by Krzysztof Kozlowski

 - fix for userspace regression (that became apparent only with shiny
   new libinput, so it's not that bad, but I still consider it 4.2
   material), in wacom driver, by Jason Gerecke

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wacom: Report correct device resolution when using the wireless adapater
  HID: hid-input: Fix accessing freed memory during device disconnect
  HID: uclogic: fix limit in uclogic_tablet_enable()