tree 0a4c644b9bf000afa28f443d22b6e0e8aea21928
parent 2f3e12bd9c52bbda42adc8c41612b1e9ab7acb1e
parent e24d0d399b2fce71b627043e900ef28283850482
author Linus Torvalds <torvalds@linux-foundation.org> 1397842294 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1397842294 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:
 - fix for merge window mismerge in hid-sony, from Frank Praznik
 - fix for Surface Type/Touch Cover 2 device, from Benjamin Tissoires
 - quirk for ThinkPad Helix sensor hub from Stephen Chandler Paul

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: core: do not scan constant input report
  Revert "HID: microsoft: Add ID's for Surface Type/Touch Cover 2"
  HID: sensor-hub: add sensor hub quirk for ThinkPad Helix
  HID: sony: Fix cancel_work_sync mismerge