Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Nov 2014 00:19:14 +0000 (16:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Nov 2014 00:19:14 +0000 (16:19 -0800)
commit6b07974af9698225766d42175470b1a5d7bf9f48
tree690cebc836a47fc50a55ea7a54acbffa513ba744
parent3b98ec4eec1ac391978c39c96e9e6ce8163ab908
parent9c5c6ed7b5078ba42b1c769a1c29b3ae4a6bee36
Merge branch 'for-linus' of git://git./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