diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-14 01:19:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-14 01:19:14 +0100 |
commit | 6b07974af9698225766d42175470b1a5d7bf9f48 (patch) | |
tree | 690cebc836a47fc50a55ea7a54acbffa513ba744 /drivers/hid/hid-sony.c | |
parent | Merge tag 'sound-3.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
parent | HID: core: cleanup .claimed field on disconnect (diff) | |
download | linux-6b07974af9698225766d42175470b1a5d7bf9f48.tar.xz linux-6b07974af9698225766d42175470b1a5d7bf9f48.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- fix for an oops in HID core upon repeated subdriver insertion/removal
under certain circumstances, by Benjamin Tissoires
- quirk for another Elan Touchscreen device, by Adel Gadllah
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: core: cleanup .claimed field on disconnect
HID: usbhid: enable always-poll quirk for Elan Touchscreen 0103
Diffstat (limited to 'drivers/hid/hid-sony.c')
0 files changed, 0 insertions, 0 deletions