Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2017 18:55:28 +0000 (10:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2017 18:55:28 +0000 (10:55 -0800)
commit95ce13138e9074b12d9de50024ae1428317eee39
treec0544bc508df2a45d8c4c1d591673e7ad331aa3b
parentcb38b45346f17f4b0a105b9315b030a2e24fb7e6
parenta89af4abdf9b353cdd6f61afc0eaaac403304873
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:

 - device descriptor length validation fix to hid-cypress driver from
   Greg

 - introduction of a short delay into i2c-hid, which is not really
   mandated by the spec, but fixes Asus Touchpads

 - Petzl USB connectable flashlight quirk from myself

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: i2c-hid: Add sleep between POWER ON and RESET
  HID: hid-cypress: validate length of report
  HID: ignore Petzl USB headlamp