diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-07-10 11:11:05 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-07-10 11:11:05 +0200 |
| commit | 604250ddcf874c4ee4137bf754f57fa903a3c1c1 (patch) | |
| tree | e6c64576e933ca81540aff02909e500a713b59d3 /init | |
| parent | Merge branches 'for-4.13/apple' and 'for-4.13/asus' into for-linus (diff) | |
| parent | HID: intel-ish-hid: Enable Gemini Lake ish driver (diff) | |
| parent | HID: Microsoft Win8 Wireless Radio Controls cleanup (diff) | |
| download | linux-604250ddcf874c4ee4137bf754f57fa903a3c1c1.tar.xz linux-604250ddcf874c4ee4137bf754f57fa903a3c1c1.zip | |
Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus
Conflicts:
drivers/hid/hid-core.c