diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-07-10 10:56:59 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-07-10 11:08:37 +0200 |
| commit | 4f94ff4e9c52b40250b8f5a54c9f99101de31e9d (patch) | |
| tree | 8fa7a065b73acdc4c26fc133e2ac11051bae0d06 /drivers/hid | |
| parent | Merge branch 'for-4.12/upstream-fixes' into for-linus (diff) | |
| parent | HID: apple: Use country code to detect ISO keyboards (diff) | |
| parent | HID: asus: Add support for Zen AiO MD-5110 keyboard (diff) | |
| download | linux-4f94ff4e9c52b40250b8f5a54c9f99101de31e9d.tar.xz linux-4f94ff4e9c52b40250b8f5a54c9f99101de31e9d.zip | |
Merge branches 'for-4.13/apple' and 'for-4.13/asus' into for-linus
Conflicts:
drivers/hid/hid-core.c