Merge branch 'for-4.12/driver-matching-fix' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Jun 2017 08:44:41 +0000 (17:44 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Jun 2017 08:44:41 +0000 (17:44 +0900)
Pull HID fix from Jiri Kosina:

 - ifdef-based bandaid for a long-standing issue with HID driver
   matching, avoiding regressions in cases where specific driver is not
   enabled in kernel .config, from Jiri Kosina

* 'for-4.12/driver-matching-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: let generic driver yield control iff specific driver has been enabled


Trivial merge