diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-02 12:42:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-02 12:42:50 -0800 |
| commit | da2875673660c114dc7d65edcd1f97023d0ed624 (patch) | |
| tree | 26e94009c2692a1eb167104d5560c3459bf1ff73 /fs | |
| parent | 74e5c265a4955d6a01adc40783346b716271170b (diff) | |
| parent | 143fca77cce906d35f7a60ccef648e888df589f2 (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 (caused by me applying a wrong version of patch) for
sensor-hub driver, from Srinivas Pandruvada
- hid-sony fixes (mostly related to DS4 device) from Roderick
Colenbrander
- three device-specific quirks-fixes from Alex Wood, Brendan McGrath
and Marcel Hasler
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: sensor-hub: Move the memset to sensor_hub_get_feature()
HID: usbhid: Add quirk for Mayflash/Dragonrise DolphinBar.
HID: usbhid: Add quirk for the Futaba TOSD-5711BB VFD
HID: sony: Ignore DS4 dongle reports when no device is connected
HID: sony: Use DS4 MAC address as unique identifier on USB
HID: sony: Fix error handling bug when touchpad registration fails
HID: asus: Fix keyboard support
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions