diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-13 16:19:14 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-13 16:19:14 -0800 |
commit | 6b07974af9698225766d42175470b1a5d7bf9f48 (patch) | |
tree | 690cebc836a47fc50a55ea7a54acbffa513ba744 /fs/ntfs/malloc.h | |
parent | 3b98ec4eec1ac391978c39c96e9e6ce8163ab908 (diff) | |
parent | 9c5c6ed7b5078ba42b1c769a1c29b3ae4a6bee36 (diff) | |
download | op-kernel-dev-6b07974af9698225766d42175470b1a5d7bf9f48.zip op-kernel-dev-6b07974af9698225766d42175470b1a5d7bf9f48.tar.gz |
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 'fs/ntfs/malloc.h')
0 files changed, 0 insertions, 0 deletions