| commit | b45edc2d02d50ba4657f29c0e2380e337d324aef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 15 17:44:41 2017 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 15 17:44:41 2017 +0900 |
| tree | 91617f21ee776a2c465724b013eff718b706ada7 | |
| parent | 906e0c5b9f1261b516487f37a6d35eb48426786f [diff] | |
| parent | 0ca4cd7bccf0b82d2c10069f295772bb7b76d006 [diff] |
Merge branch 'for-4.12/driver-matching-fix' of git://git.kernel.org/pub/scm/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