From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Jun 2017 08:44:41 +0000 (+0900)
Subject: Merge branch 'for-4.12/driver-matching-fix' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: android-x86-8.1-r1~3380
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b45edc2d02d50ba4657f29c0e2380e337d324aef;p=android-x86%2Fkernel.git

Merge branch 'for-4.12/driver-matching-fix' of git://git./linux/kernel/git/jikos/hid

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
---

b45edc2d02d50ba4657f29c0e2380e337d324aef