diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-01-03 12:50:28 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-01-03 12:50:28 +0100 |
| commit | bd8879faafe6d057237461c4d58d8b0d37b9e3ee (patch) | |
| tree | ccbdf5dbc7c7d76191b57ced7fedcab78010d873 | |
| parent | f8f807441eefddc3c6d8a378421f0ede6361d565 (diff) | |
| parent | 8c32d47b151b675291ca4278bfce0ec3eb46fad8 (diff) | |
| parent | 0e1f37d120ec316e78b62ee570eec98e808ff0a4 (diff) | |
| parent | 7f5592742a429b4de770fc5b796d18de43a15fdc (diff) | |
| parent | aeed35faee5261e6e93d51192923b7a7c3c4dab5 (diff) | |
| parent | 31a8b3ee16e3051a0d9abc557ca203e2330621b6 (diff) | |
| parent | 16767229940fb18086430907d3cd46245c7398ac (diff) | |
| parent | 74fbc7d371d9a438b8e39d926d9d5012d2f762c4 (diff) | |
Merge branches 'for-4.20/upstream-fixes', 'for-4.21/core', 'for-4.21/hid-asus', 'for-4.21/hid-core', 'for-4.21/hid-cougar', 'for-4.21/hidraw', 'for-4.21/highres-wheel' and 'for-4.21/ish' into for-linus