[GIT PULL] HID

[Jiri Kosina]

Linus,

please pull from

	git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git for-linus

to receive


- 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


thanks.

----------------------------------------------------------------
Benjamin Tissoires (1):
      HID: core: do not scan constant input report

Derya (1):
      Revert "HID: microsoft: Add ID's for Surface Type/Touch Cover 2"

Frank Praznik (1):
      HID: sony: Fix cancel_work_sync mismerge

Stephen Chandler Paul (1):
      HID: sensor-hub: add sensor hub quirk for ThinkPad Helix

 drivers/hid/hid-core.c       | 5 +++--
 drivers/hid/hid-ids.h        | 5 ++---
 drivers/hid/hid-microsoft.c  | 4 ----
 drivers/hid/hid-sensor-hub.c | 7 +++++--
 drivers/hid/hid-sony.c       | 2 --
 5 files changed, 10 insertions(+), 13 deletions(-)

-- 
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/