From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Dec 2017 18:16:51 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v4.15-rc6~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efdd17f89510531a6529e20048670bef9a073466;p=thirdparty%2Fkernel%2Fstable.git

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

Pull HID fixes from Jiri Kosina:

 - two cosmetic fixes from Daniel Axtens and Hans de Goede

 - fix for I2C command mismatch fix for cp2112 driver from Eudean Sun

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: core: lower log level for unknown main item tags to warnings
  HID: holtekff: move MODULE_* parameters out of #ifdef block
  HID: cp2112: Fix I2C_BLOCK_DATA transactions
---

efdd17f89510531a6529e20048670bef9a073466