diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-31 13:05:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-31 13:05:15 -0800 |
| commit | c9194b99ae1825bdbafc701965442a47739ff0ad (patch) | |
| tree | 76dbb4da02aea1ba8bd886b7b2c53fdb26202710 /include/net/snmp.h | |
| parent | 415f9b71d17d294c2f2075b3fc7717d72e5e48f9 (diff) | |
| parent | 8e9faa15469ed7c7467423db4c62aeed3ff4cae3 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- regression fix (sleeping while atomic) for cp2112, from Johan Hovold
- regression fix for proximity handling under certain circumstances in
Wacom driver, from Jason Gerecke
- functional fix for Logitech Rumblepad 2, from Ardinartsev Nikita
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: cp2112: fix gpio-callback error handling
HID: cp2112: fix sleep-while-atomic
HID: hid-lg: Fix immediate disconnection of Logitech Rumblepad 2
HID: usbhid: Quirk a AMI virtual mouse and keyboard with ALWAYS_POLL
HID: wacom: Fix poor prox handling in 'wacom_pl_irq'
Diffstat (limited to 'include/net/snmp.h')
0 files changed, 0 insertions, 0 deletions