diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-10 22:16:48 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-10 22:16:48 (GMT) |
| commit | 7a834ba5e26e9e4afabf3cce9ca8cd1c6c3dce50 (patch) | |
| tree | 0c0a5dfa418127e316d80fad8c721fe734e059c4 /net/nfc | |
| parent | 2b9bea035a488774b176f14f53160442e8906ad8 (diff) | |
| parent | 0be017120b80f0fe3da9a8239f989a27e54828f2 (diff) | |
| download | linux-7a834ba5e26e9e4afabf3cce9ca8cd1c6c3dce50.tar.xz | |
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()
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions