diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-01-11 22:09:34 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-01-11 22:09:34 +0100 |
| commit | dd54ccb7d1ffed1a565fb2fbf166d91c22fbc7cf (patch) | |
| tree | 2e3abb2df9032024ea582dff7f2bbbdf3d8c065a /drivers/hid/hid-core.c | |
| parent | d7f6872e5ef652b3e74bbde3f8076a89ff18c281 (diff) | |
| parent | a89af4abdf9b353cdd6f61afc0eaaac403304873 (diff) | |
| parent | 66e5c5ffc7a5e4d36d136ce4fd8bdb4e92ecec7b (diff) | |
Merge branches 'for-4.10/upstream-fixes' and 'for-4.11/microsoft' into for-next