Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Mar 2017 18:50:31 +0000 (11:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Mar 2017 18:50:31 +0000 (11:50 -0700)
commiteee551df28b4cf8e1a07d229a2e4c65649f11472
tree52da279282ffd133ad6dd783ef0011003a1aaa0c
parent5559394d18442bb4abce68348de662d222634022
parent4d20c332de377fa5b06c46f6f34174c10dd998e4
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:

 - Wacom regression fixes, from Aaron Armstrong Skomra

 - new device ID addition by Peter Stein

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wacom: call _query_tablet_data() for BAMBOO_TOUCH
  HID: wacom: Don't add ghost interface as shared data
  HID: xinmo: fix for out of range for THT 2P arcade controller.